diff options
| author | Christopher Speller <crspeller@gmail.com> | 2018-04-27 12:49:45 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-27 12:49:45 -0700 |
| commit | 686c2fbab7607d42183ae685a27ea3d7dce8c3f6 (patch) | |
| tree | 53ed73cada57bc43f342ac10e2f842cddb095218 /app/diagnostics.go | |
| parent | 2acbc77d78456d7ba76ceb687b18985d7d92f814 (diff) | |
| download | chat-686c2fbab7607d42183ae685a27ea3d7dce8c3f6.tar.gz chat-686c2fbab7607d42183ae685a27ea3d7dce8c3f6.tar.bz2 chat-686c2fbab7607d42183ae685a27ea3d7dce8c3f6.zip | |
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.
Diffstat (limited to 'app/diagnostics.go')
| -rw-r--r-- | app/diagnostics.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/diagnostics.go b/app/diagnostics.go index 6e9adbf3c..cda0814ca 100644 --- a/app/diagnostics.go +++ b/app/diagnostics.go @@ -5,11 +5,10 @@ package app import ( "encoding/json" - "log" - "os" "runtime" "sync/atomic" + "github.com/mattermost/mattermost-server/mlog" "github.com/mattermost/mattermost-server/model" "github.com/segmentio/analytics-go" ) @@ -69,12 +68,12 @@ func (a *App) SendDailyDiagnostics() { func (a *App) initDiagnostics(endpoint string) { if client == nil { client = analytics.New(SEGMENT_KEY) + client.Logger = a.Log.StdLog(mlog.String("source", "segment")) // For testing if endpoint != "" { client.Endpoint = endpoint client.Verbose = true client.Size = 1 - client.Logger = log.New(os.Stdout, "segment ", log.LstdFlags) } client.Identify(&analytics.Identify{ UserId: a.DiagnosticId(), @@ -299,10 +298,11 @@ func (a *App) trackConfig() { a.SendDiagnostic(TRACK_CONFIG_LOG, map[string]interface{}{ "enable_console": cfg.LogSettings.EnableConsole, "console_level": cfg.LogSettings.ConsoleLevel, + "console_json": *cfg.LogSettings.ConsoleJson, "enable_file": cfg.LogSettings.EnableFile, "file_level": cfg.LogSettings.FileLevel, + "file_json": cfg.LogSettings.FileJson, "enable_webhook_debugging": cfg.LogSettings.EnableWebhookDebugging, - "isdefault_file_format": isDefault(cfg.LogSettings.FileFormat, ""), "isdefault_file_location": isDefault(cfg.LogSettings.FileLocation, ""), }) |