diff options
| author | Chris <ccbrown112@gmail.com> | 2017-10-31 09:39:31 -0500 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2017-10-31 10:39:31 -0400 |
| commit | ce2b2be5de578bd9eb44b26e04db75ca61d67ca5 (patch) | |
| tree | 54203a18ecfb167dcf1d7e0742cea0ed9aab220a /cmd/platform | |
| parent | b446d0aa0aa2bd3d87028b0543752eb539507481 (diff) | |
| download | chat-ce2b2be5de578bd9eb44b26e04db75ca61d67ca5.tar.gz chat-ce2b2be5de578bd9eb44b26e04db75ca61d67ca5.tar.bz2 chat-ce2b2be5de578bd9eb44b26e04db75ca61d67ca5.zip | |
Refactoring cfg refs and load / save functions (#7749)
* refactoring cfg refs and load / save functions
* improve error output
Diffstat (limited to 'cmd/platform')
| -rw-r--r-- | cmd/platform/test.go | 23 | ||||
| -rw-r--r-- | cmd/platform/user.go | 2 |
2 files changed, 13 insertions, 12 deletions
diff --git a/cmd/platform/test.go b/cmd/platform/test.go index 08438e034..faf265a0d 100644 --- a/cmd/platform/test.go +++ b/cmd/platform/test.go @@ -14,6 +14,7 @@ import ( "github.com/mattermost/mattermost-server/api" "github.com/mattermost/mattermost-server/api4" + "github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/utils" "github.com/mattermost/mattermost-server/wsapi" "github.com/spf13/cobra" @@ -51,12 +52,12 @@ func webClientTestsCmdF(cmd *cobra.Command, args []string) error { } defer a.Shutdown() - utils.InitTranslations(utils.Cfg.LocalizationSettings) + utils.InitTranslations(a.Config().LocalizationSettings) a.StartServer() api4.Init(a, a.Srv.Router, false) api.Init(a, a.Srv.Router) wsapi.Init(a, a.Srv.WebSocketRouter) - setupClientTests() + a.UpdateConfig(setupClientTests) runWebClientTests() return nil @@ -69,12 +70,12 @@ func serverForWebClientTestsCmdF(cmd *cobra.Command, args []string) error { } defer a.Shutdown() - utils.InitTranslations(utils.Cfg.LocalizationSettings) + utils.InitTranslations(a.Config().LocalizationSettings) a.StartServer() api4.Init(a, a.Srv.Router, false) api.Init(a, a.Srv.Router) wsapi.Init(a, a.Srv.WebSocketRouter) - setupClientTests() + a.UpdateConfig(setupClientTests) c := make(chan os.Signal) signal.Notify(c, os.Interrupt, syscall.SIGINT, syscall.SIGTERM) @@ -83,13 +84,13 @@ func serverForWebClientTestsCmdF(cmd *cobra.Command, args []string) error { return nil } -func setupClientTests() { - *utils.Cfg.TeamSettings.EnableOpenServer = true - *utils.Cfg.ServiceSettings.EnableCommands = false - *utils.Cfg.ServiceSettings.EnableOnlyAdminIntegrations = false - *utils.Cfg.ServiceSettings.EnableCustomEmoji = true - utils.Cfg.ServiceSettings.EnableIncomingWebhooks = false - utils.Cfg.ServiceSettings.EnableOutgoingWebhooks = false +func setupClientTests(cfg *model.Config) { + *cfg.TeamSettings.EnableOpenServer = true + *cfg.ServiceSettings.EnableCommands = false + *cfg.ServiceSettings.EnableOnlyAdminIntegrations = false + *cfg.ServiceSettings.EnableCustomEmoji = true + cfg.ServiceSettings.EnableIncomingWebhooks = false + cfg.ServiceSettings.EnableOutgoingWebhooks = false utils.SetDefaultRolesBasedOnConfig() } diff --git a/cmd/platform/user.go b/cmd/platform/user.go index bc5838795..66b0f2223 100644 --- a/cmd/platform/user.go +++ b/cmd/platform/user.go @@ -289,7 +289,7 @@ func inviteUser(a *app.App, email string, team *model.Team, teamArg string) erro return fmt.Errorf("Can't find team '%v'", teamArg) } - a.SendInviteEmails(team, "Administrator", invites, *utils.Cfg.ServiceSettings.SiteURL) + a.SendInviteEmails(team, "Administrator", invites, *a.Config().ServiceSettings.SiteURL) CommandPrettyPrintln("Invites may or may not have been sent.") return nil |