IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

set to default value with config is missing (#7320)

Browse Source
This commit is contained in:
Saturnino Abril
2017-08-31 01:54:16 +08:00
committed by Joram Wilander
parent 4c1f467442
commit 651dd33b29
41 changed files with 252 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
utils/config.go
View File

@@ -20,9 +20,10 @@ import (
"github.com/fsnotify/fsnotify"
"github.com/spf13/viper"
"net/http"
"github.com/mattermost/platform/einterfaces"
"github.com/mattermost/platform/model"
"net/http"
)
const (
@@ -376,7 +377,7 @@ func LoadConfig(fileName string) {
configureLog(&config.LogSettings)
if config.FileSettings.DriverName == model.IMAGE_DRIVER_LOCAL {
if *config.FileSettings.DriverName == model.IMAGE_DRIVER_LOCAL {
dir := config.FileSettings.Directory
if len(dir) > 0 && dir[len(dir)-1:] != "/" {
config.FileSettings.Directory += "/"
@@ -491,7 +492,7 @@ func getClientConfig(c *model.Config) map[string]string {
props["DefaultClientLocale"] = *c.LocalizationSettings.DefaultClientLocale
props["AvailableLocales"] = *c.LocalizationSettings.AvailableLocales
props["SQLDriverName"] = c.SqlSettings.DriverName
props["SQLDriverName"] = *c.SqlSettings.DriverName
props["EnableCustomEmoji"] = strconv.FormatBool(*c.ServiceSettings.EnableCustomEmoji)
props["EnableEmojiPicker"] = strconv.FormatBool(*c.ServiceSettings.EnableEmojiPicker)
@@ -657,8 +658,8 @@ func Desanitize(cfg *model.Config) {
cfg.GitLabSettings.Secret = Cfg.GitLabSettings.Secret
}
if cfg.SqlSettings.DataSource == model.FAKE_SETTING {
cfg.SqlSettings.DataSource = Cfg.SqlSettings.DataSource
if *cfg.SqlSettings.DataSource == model.FAKE_SETTING {
*cfg.SqlSettings.DataSource = *Cfg.SqlSettings.DataSource
}
if cfg.SqlSettings.AtRestEncryptKey == model.FAKE_SETTING {
cfg.SqlSettings.AtRestEncryptKey = Cfg.SqlSettings.AtRestEncryptKey