From 768f2b85bcf8b4f9827b5d44a2fb14868219a57e Mon Sep 17 00:00:00 2001
From: Harrison Healey <harrisonmhealey@gmail.com>
Date: Thu, 19 Jul 2018 05:01:39 -0400
Subject: MM-11389 Added diagnostics for FileSettings.Directory (#9125)

---
 app/diagnostics.go | 3 +++
 model/config.go    | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/diagnostics.go b/app/diagnostics.go
index fa6ad6bd5..72195b3d1 100644
--- a/app/diagnostics.go
+++ b/app/diagnostics.go
@@ -4,6 +4,7 @@
 package app
 
 import (
+	"path/filepath"
 	"runtime"
 
 	"github.com/mattermost/mattermost-server/mlog"
@@ -326,6 +327,8 @@ func (a *App) trackConfig() {
 	a.SendDiagnostic(TRACK_CONFIG_FILE, map[string]interface{}{
 		"enable_public_links":     cfg.FileSettings.EnablePublicLink,
 		"driver_name":             *cfg.FileSettings.DriverName,
+		"isdefault_directory":     isDefault(cfg.FileSettings.Directory, model.FILE_SETTINGS_DEFAULT_DIRECTORY),
+		"isabsolute_directory":    filepath.IsAbs(cfg.FileSettings.Directory),
 		"amazon_s3_ssl":           *cfg.FileSettings.AmazonS3SSL,
 		"amazon_s3_sse":           *cfg.FileSettings.AmazonS3SSE,
 		"amazon_s3_signv2":        *cfg.FileSettings.AmazonS3SignV2,
diff --git a/model/config.go b/model/config.go
index 904668606..d40851a9a 100644
--- a/model/config.go
+++ b/model/config.go
@@ -97,6 +97,8 @@ const (
 
 	SQL_SETTINGS_DEFAULT_DATA_SOURCE = "mmuser:mostest@tcp(dockerhost:3306)/mattermost_test?charset=utf8mb4,utf8&readTimeout=30s&writeTimeout=30s"
 
+	FILE_SETTINGS_DEFAULT_DIRECTORY = "./data/"
+
 	EMAIL_SETTINGS_DEFAULT_FEEDBACK_ORGANIZATION = ""
 
 	SUPPORT_SETTINGS_DEFAULT_TERMS_OF_SERVICE_LINK = "https://about.mattermost.com/default-terms/"
@@ -789,7 +791,7 @@ func (s *FileSettings) SetDefaults() {
 	}
 
 	if s.Directory == "" {
-		s.Directory = "./data/"
+		s.Directory = FILE_SETTINGS_DEFAULT_DIRECTORY
 	}
 }
 
-- 
cgit v1.2.3-1-g7c22