MM-11389 Added diagnostics for FileSettings.Directory (#9125)

This commit is contained in:
Harrison Healey
2018-07-19 05:01:39 -04:00
committed by Jesús Espino
parent a575411f15
commit 768f2b85bc
2 changed files with 6 additions and 1 deletions

View File

@@ -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,

View File

@@ -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
}
}