From 651dd33b29b7b8b296cc5a12479684fa836867b1 Mon Sep 17 00:00:00 2001 From: Saturnino Abril Date: Thu, 31 Aug 2017 01:54:16 +0800 Subject: set to default value with config is missing (#7320) --- app/apptestlib.go | 4 ++-- app/authentication.go | 2 +- app/brand.go | 4 ++-- app/diagnostics.go | 18 +++++++++--------- app/emoji.go | 2 +- app/file.go | 2 +- app/security_update_check.go | 2 +- app/server.go | 8 ++++---- app/user.go | 2 +- 9 files changed, 22 insertions(+), 22 deletions(-) (limited to 'app') diff --git a/app/apptestlib.go b/app/apptestlib.go index 3cf831f60..47fd6c727 100644 --- a/app/apptestlib.go +++ b/app/apptestlib.go @@ -25,7 +25,7 @@ func SetupEnterprise() *TestHelper { utils.TranslationsPreInit() utils.LoadConfig("config.json") utils.InitTranslations(utils.Cfg.LocalizationSettings) - utils.Cfg.TeamSettings.MaxUsersPerTeam = 50 + *utils.Cfg.TeamSettings.MaxUsersPerTeam = 50 *utils.Cfg.RateLimitSettings.Enable = false utils.DisableDebugLogForTest() utils.License().Features.SetDefaults() @@ -47,7 +47,7 @@ func Setup() *TestHelper { utils.TranslationsPreInit() utils.LoadConfig("config.json") utils.InitTranslations(utils.Cfg.LocalizationSettings) - utils.Cfg.TeamSettings.MaxUsersPerTeam = 50 + *utils.Cfg.TeamSettings.MaxUsersPerTeam = 50 *utils.Cfg.RateLimitSettings.Enable = false utils.DisableDebugLogForTest() NewServer() diff --git a/app/authentication.go b/app/authentication.go index b09234d5f..5319e54e0 100644 --- a/app/authentication.go +++ b/app/authentication.go @@ -121,7 +121,7 @@ func CheckUserMfa(user *model.User, token string) *model.AppError { } func checkUserLoginAttempts(user *model.User) *model.AppError { - if user.FailedAttempts >= utils.Cfg.ServiceSettings.MaximumLoginAttempts { + if user.FailedAttempts >= *utils.Cfg.ServiceSettings.MaximumLoginAttempts { return model.NewAppError("checkUserLoginAttempts", "api.user.check_user_login_attempts.too_many.app_error", nil, "user_id="+user.Id, http.StatusUnauthorized) } diff --git a/app/brand.go b/app/brand.go index bb11bd581..5fe24e155 100644 --- a/app/brand.go +++ b/app/brand.go @@ -13,7 +13,7 @@ import ( ) func SaveBrandImage(imageData *multipart.FileHeader) *model.AppError { - if len(utils.Cfg.FileSettings.DriverName) == 0 { + if len(*utils.Cfg.FileSettings.DriverName) == 0 { return model.NewAppError("SaveBrandImage", "api.admin.upload_brand_image.storage.app_error", nil, "", http.StatusNotImplemented) } @@ -30,7 +30,7 @@ func SaveBrandImage(imageData *multipart.FileHeader) *model.AppError { } func GetBrandImage() ([]byte, *model.AppError) { - if len(utils.Cfg.FileSettings.DriverName) == 0 { + if len(*utils.Cfg.FileSettings.DriverName) == 0 { return nil, model.NewAppError("GetBrandImage", "api.admin.get_brand_image.storage.app_error", nil, "", http.StatusNotImplemented) } diff --git a/app/diagnostics.go b/app/diagnostics.go index 9946ce9f1..71b674461 100644 --- a/app/diagnostics.go +++ b/app/diagnostics.go @@ -197,7 +197,7 @@ func trackConfig() { "connection_security": *utils.Cfg.ServiceSettings.ConnectionSecurity, "uses_letsencrypt": *utils.Cfg.ServiceSettings.UseLetsEncrypt, "forward_80_to_443": *utils.Cfg.ServiceSettings.Forward80To443, - "maximum_login_attempts": utils.Cfg.ServiceSettings.MaximumLoginAttempts, + "maximum_login_attempts": *utils.Cfg.ServiceSettings.MaximumLoginAttempts, "session_length_web_in_days": *utils.Cfg.ServiceSettings.SessionLengthWebInDays, "session_length_mobile_in_days": *utils.Cfg.ServiceSettings.SessionLengthMobileInDays, "session_length_sso_in_days": *utils.Cfg.ServiceSettings.SessionLengthSSOInDays, @@ -235,7 +235,7 @@ func trackConfig() { "enable_custom_brand": *utils.Cfg.TeamSettings.EnableCustomBrand, "restrict_direct_message": *utils.Cfg.TeamSettings.RestrictDirectMessage, "max_notifications_per_channel": *utils.Cfg.TeamSettings.MaxNotificationsPerChannel, - "max_users_per_team": utils.Cfg.TeamSettings.MaxUsersPerTeam, + "max_users_per_team": *utils.Cfg.TeamSettings.MaxUsersPerTeam, "max_channels_per_team": *utils.Cfg.TeamSettings.MaxChannelsPerTeam, "teammate_name_display": *utils.Cfg.TeamSettings.TeammateNameDisplay, "isdefault_site_name": isDefault(utils.Cfg.TeamSettings.SiteName, "Mattermost"), @@ -255,10 +255,10 @@ func trackConfig() { }) SendDiagnostic(TRACK_CONFIG_SQL, map[string]interface{}{ - "driver_name": utils.Cfg.SqlSettings.DriverName, + "driver_name": *utils.Cfg.SqlSettings.DriverName, "trace": utils.Cfg.SqlSettings.Trace, - "max_idle_conns": utils.Cfg.SqlSettings.MaxIdleConns, - "max_open_conns": utils.Cfg.SqlSettings.MaxOpenConns, + "max_idle_conns": *utils.Cfg.SqlSettings.MaxIdleConns, + "max_open_conns": *utils.Cfg.SqlSettings.MaxOpenConns, "data_source_replicas": len(utils.Cfg.SqlSettings.DataSourceReplicas), "data_source_search_replicas": len(utils.Cfg.SqlSettings.DataSourceSearchReplicas), "query_timeout": *utils.Cfg.SqlSettings.QueryTimeout, @@ -284,7 +284,7 @@ func trackConfig() { SendDiagnostic(TRACK_CONFIG_FILE, map[string]interface{}{ "enable_public_links": utils.Cfg.FileSettings.EnablePublicLink, - "driver_name": utils.Cfg.FileSettings.DriverName, + "driver_name": *utils.Cfg.FileSettings.DriverName, "amazon_s3_ssl": *utils.Cfg.FileSettings.AmazonS3SSL, "amazon_s3_sse": *utils.Cfg.FileSettings.AmazonS3SSE, "amazon_s3_signv2": *utils.Cfg.FileSettings.AmazonS3SignV2, @@ -313,9 +313,9 @@ func trackConfig() { SendDiagnostic(TRACK_CONFIG_RATE, map[string]interface{}{ "enable_rate_limiter": *utils.Cfg.RateLimitSettings.Enable, "vary_by_remote_address": utils.Cfg.RateLimitSettings.VaryByRemoteAddr, - "per_sec": utils.Cfg.RateLimitSettings.PerSec, + "per_sec": *utils.Cfg.RateLimitSettings.PerSec, "max_burst": *utils.Cfg.RateLimitSettings.MaxBurst, - "memory_store_size": utils.Cfg.RateLimitSettings.MemoryStoreSize, + "memory_store_size": *utils.Cfg.RateLimitSettings.MemoryStoreSize, "isdefault_vary_by_header": isDefault(utils.Cfg.RateLimitSettings.VaryByHeader, ""), }) @@ -456,7 +456,7 @@ func trackServer() { data := map[string]interface{}{ "edition": model.BuildEnterpriseReady, "version": model.CurrentVersion, - "database_type": utils.Cfg.SqlSettings.DriverName, + "database_type": *utils.Cfg.SqlSettings.DriverName, "operating_system": runtime.GOOS, } diff --git a/app/emoji.go b/app/emoji.go index e01ca97ae..f10170cfb 100644 --- a/app/emoji.go +++ b/app/emoji.go @@ -142,7 +142,7 @@ func GetEmoji(emojiId string) (*model.Emoji, *model.AppError) { return nil, model.NewAppError("deleteEmoji", "api.emoji.disabled.app_error", nil, "", http.StatusNotImplemented) } - if len(utils.Cfg.FileSettings.DriverName) == 0 { + if len(*utils.Cfg.FileSettings.DriverName) == 0 { return nil, model.NewAppError("deleteImage", "api.emoji.storage.app_error", nil, "", http.StatusNotImplemented) } diff --git a/app/file.go b/app/file.go index 10fb1425c..3c2a2b3e4 100644 --- a/app/file.go +++ b/app/file.go @@ -244,7 +244,7 @@ func GeneratePublicLinkHash(fileId, salt string) string { } func UploadFiles(teamId string, channelId string, userId string, fileHeaders []*multipart.FileHeader, clientIds []string) (*model.FileUploadResponse, *model.AppError) { - if len(utils.Cfg.FileSettings.DriverName) == 0 { + if len(*utils.Cfg.FileSettings.DriverName) == 0 { return nil, model.NewAppError("uploadFile", "api.file.upload_file.storage.app_error", nil, "", http.StatusNotImplemented) } diff --git a/app/security_update_check.go b/app/security_update_check.go index 12014bdf3..607dd1b8a 100644 --- a/app/security_update_check.go +++ b/app/security_update_check.go @@ -45,7 +45,7 @@ func DoSecurityUpdateCheck() { v.Set(PROP_SECURITY_ID, utils.CfgDiagnosticId) v.Set(PROP_SECURITY_BUILD, model.CurrentVersion+"."+model.BuildNumber) v.Set(PROP_SECURITY_ENTERPRISE_READY, model.BuildEnterpriseReady) - v.Set(PROP_SECURITY_DATABASE, utils.Cfg.SqlSettings.DriverName) + v.Set(PROP_SECURITY_DATABASE, *utils.Cfg.SqlSettings.DriverName) v.Set(PROP_SECURITY_OS, runtime.GOOS) if len(props[model.SYSTEM_RAN_UNIT_TESTS]) > 0 { diff --git a/app/server.go b/app/server.go index a5b2dbda9..b83aa9506 100644 --- a/app/server.go +++ b/app/server.go @@ -133,14 +133,14 @@ func StartServer() { if *utils.Cfg.RateLimitSettings.Enable { l4g.Info(utils.T("api.server.start_server.rate.info")) - store, err := memstore.New(utils.Cfg.RateLimitSettings.MemoryStoreSize) + store, err := memstore.New(*utils.Cfg.RateLimitSettings.MemoryStoreSize) if err != nil { l4g.Critical(utils.T("api.server.start_server.rate_limiting_memory_store")) return } quota := throttled.RateQuota{ - MaxRate: throttled.PerSec(utils.Cfg.RateLimitSettings.PerSec), + MaxRate: throttled.PerSec(*utils.Cfg.RateLimitSettings.PerSec), MaxBurst: *utils.Cfg.RateLimitSettings.MaxBurst, } @@ -165,13 +165,13 @@ func StartServer() { Srv.GracefulServer = &graceful.Server{ Timeout: TIME_TO_WAIT_FOR_CONNECTIONS_TO_CLOSE_ON_SERVER_SHUTDOWN, Server: &http.Server{ - Addr: utils.Cfg.ServiceSettings.ListenAddress, + Addr: *utils.Cfg.ServiceSettings.ListenAddress, Handler: handlers.RecoveryHandler(handlers.RecoveryLogger(&RecoveryLogger{}), handlers.PrintRecoveryStack(true))(handler), ReadTimeout: time.Duration(*utils.Cfg.ServiceSettings.ReadTimeout) * time.Second, WriteTimeout: time.Duration(*utils.Cfg.ServiceSettings.WriteTimeout) * time.Second, }, } - l4g.Info(utils.T("api.server.start_server.listening.info"), utils.Cfg.ServiceSettings.ListenAddress) + l4g.Info(utils.T("api.server.start_server.listening.info"), *utils.Cfg.ServiceSettings.ListenAddress) if *utils.Cfg.ServiceSettings.Forward80To443 { go func() { diff --git a/app/user.go b/app/user.go index 40e32c282..ab2133b2f 100644 --- a/app/user.go +++ b/app/user.go @@ -750,7 +750,7 @@ func GetProfileImage(user *model.User) ([]byte, bool, *model.AppError) { var img []byte readFailed := false - if len(utils.Cfg.FileSettings.DriverName) == 0 { + if len(*utils.Cfg.FileSettings.DriverName) == 0 { var err *model.AppError if img, err = CreateProfileImage(user.Username, user.Id); err != nil { return nil, false, err -- cgit v1.2.3-1-g7c22