MM-11389 Added diagnostics for FileSettings.Directory (#9125)
Этот коммит содержится в:
коммит произвёл
Jesús Espino
родитель
a575411f15
Коммит
768f2b85bc
@@ -4,6 +4,7 @@
|
|||||||
package app
|
package app
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"path/filepath"
|
||||||
"runtime"
|
"runtime"
|
||||||
|
|
||||||
"github.com/mattermost/mattermost-server/mlog"
|
"github.com/mattermost/mattermost-server/mlog"
|
||||||
@@ -326,6 +327,8 @@ func (a *App) trackConfig() {
|
|||||||
a.SendDiagnostic(TRACK_CONFIG_FILE, map[string]interface{}{
|
a.SendDiagnostic(TRACK_CONFIG_FILE, map[string]interface{}{
|
||||||
"enable_public_links": cfg.FileSettings.EnablePublicLink,
|
"enable_public_links": cfg.FileSettings.EnablePublicLink,
|
||||||
"driver_name": *cfg.FileSettings.DriverName,
|
"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_ssl": *cfg.FileSettings.AmazonS3SSL,
|
||||||
"amazon_s3_sse": *cfg.FileSettings.AmazonS3SSE,
|
"amazon_s3_sse": *cfg.FileSettings.AmazonS3SSE,
|
||||||
"amazon_s3_signv2": *cfg.FileSettings.AmazonS3SignV2,
|
"amazon_s3_signv2": *cfg.FileSettings.AmazonS3SignV2,
|
||||||
|
|||||||
@@ -97,6 +97,8 @@ const (
|
|||||||
|
|
||||||
SQL_SETTINGS_DEFAULT_DATA_SOURCE = "mmuser:mostest@tcp(dockerhost:3306)/mattermost_test?charset=utf8mb4,utf8&readTimeout=30s&writeTimeout=30s"
|
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 = ""
|
EMAIL_SETTINGS_DEFAULT_FEEDBACK_ORGANIZATION = ""
|
||||||
|
|
||||||
SUPPORT_SETTINGS_DEFAULT_TERMS_OF_SERVICE_LINK = "https://about.mattermost.com/default-terms/"
|
SUPPORT_SETTINGS_DEFAULT_TERMS_OF_SERVICE_LINK = "https://about.mattermost.com/default-terms/"
|
||||||
@@ -789,7 +791,7 @@ func (s *FileSettings) SetDefaults() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if s.Directory == "" {
|
if s.Directory == "" {
|
||||||
s.Directory = "./data/"
|
s.Directory = FILE_SETTINGS_DEFAULT_DIRECTORY
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user