From 686c2fbab7607d42183ae685a27ea3d7dce8c3f6 Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Fri, 27 Apr 2018 12:49:45 -0700 Subject: Structured logging (#8673) * Implementing structured logging * Changes to en.json to allow refactor to run. * Fixing global logger * Structured logger initalization. * Add caller. * Do some log redirection. * Auto refactor * Cleaning up l4g reference and removing dependancy. * Removing junk. * Copyright headers. * Fixing tests * Revert "Changes to en.json to allow refactor to run." This reverts commit fd8249e99bcad0231e6ea65cd77c32aae9a54026. * Fixing some auto refactor strangeness and typo. * Making keys more human readable. --- api4/webhook.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'api4/webhook.go') diff --git a/api4/webhook.go b/api4/webhook.go index a0e7b5785..fadc3fbf3 100644 --- a/api4/webhook.go +++ b/api4/webhook.go @@ -4,16 +4,15 @@ package api4 import ( + "fmt" "io" "net/http" "strings" - l4g "github.com/alecthomas/log4go" - "github.com/gorilla/mux" "github.com/gorilla/schema" + "github.com/mattermost/mattermost-server/mlog" "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/utils" ) func (api *API) InitWebhook() { @@ -492,7 +491,7 @@ func incomingWebhook(c *Context, w http.ResponseWriter, r *http.Request) { } if c.App.Config().LogSettings.EnableWebhookDebugging { - l4g.Debug(utils.T("api.webhook.incoming.debug"), incomingWebhookPayload.ToJson()) + mlog.Debug(fmt.Sprint("Incoming webhook received. Content=", incomingWebhookPayload.ToJson())) } err = c.App.HandleIncomingWebhook(id, incomingWebhookPayload) -- cgit v1.2.3-1-g7c22