From 686c2fbab7607d42183ae685a27ea3d7dce8c3f6 Mon Sep 17 00:00:00 2001
From: Christopher Speller <crspeller@gmail.com>
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.
---
 app/diagnostics.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'app/diagnostics.go')

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, ""),
 	})
 
-- 
cgit v1.2.3-1-g7c22


From 2f175001b45fb282600e4a9aee3c8a79fc682821 Mon Sep 17 00:00:00 2001
From: Jason Blais <jason@spinpunch.com>
Date: Mon, 30 Apr 2018 10:37:15 -0400
Subject: Add missing diagnostics for 4.10 (#8675)

* Add missing diagnostics for 4.10

* Add missing ":"
---
 app/diagnostics.go | 1 +
 1 file changed, 1 insertion(+)

(limited to 'app/diagnostics.go')

diff --git a/app/diagnostics.go b/app/diagnostics.go
index cda0814ca..6237f5f83 100644
--- a/app/diagnostics.go
+++ b/app/diagnostics.go
@@ -272,6 +272,7 @@ func (a *App) trackConfig() {
 		"isdefault_user_status_away_timeout":      isDefault(*cfg.TeamSettings.UserStatusAwayTimeout, model.TEAM_SETTINGS_DEFAULT_USER_STATUS_AWAY_TIMEOUT),
 		"restrict_private_channel_manage_members": *cfg.TeamSettings.RestrictPrivateChannelManageMembers,
 		"enable_X_to_leave_channels_from_LHS":     *cfg.TeamSettings.EnableXToLeaveChannelsFromLHS,
+		"experimental_enable_automatic_replies":   *cfg.TeamSettings.ExperimentalEnableAutomaticReplies,
 		"experimental_town_square_is_read_only":   *cfg.TeamSettings.ExperimentalTownSquareIsReadOnly,
 		"experimental_primary_team":               isDefault(*cfg.TeamSettings.ExperimentalPrimaryTeam, ""),
 	})
-- 
cgit v1.2.3-1-g7c22