diff options
| author | Harrison Healey <harrisonmhealey@gmail.com> | 2015-09-29 17:33:16 -0400 |
|---|---|---|
| committer | Harrison Healey <harrisonmhealey@gmail.com> | 2015-09-29 17:33:16 -0400 |
| commit | 5e9dccc464590ffe6e05041b76192bb6f12e30c6 (patch) | |
| tree | b3c76aa86bdb4e50bc7c3f3456cfa78e26f38c25 /api/admin.go | |
| parent | fb9fe1995ca7502bea23e1ab7082e8c8757251fb (diff) | |
| parent | 8fadea44debd00c1babd12bff9eb2dd0a5d99370 (diff) | |
| download | chat-5e9dccc464590ffe6e05041b76192bb6f12e30c6.tar.gz chat-5e9dccc464590ffe6e05041b76192bb6f12e30c6.tar.bz2 chat-5e9dccc464590ffe6e05041b76192bb6f12e30c6.zip | |
Merge pull request #865 from mattermost/PLT-404
PLT-404 adding basic error checking to config file.
Diffstat (limited to 'api/admin.go')
| -rw-r--r-- | api/admin.go | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/api/admin.go b/api/admin.go index 568d8f6e8..3ef8c12a8 100644 --- a/api/admin.go +++ b/api/admin.go @@ -82,18 +82,11 @@ func saveConfig(c *Context, w http.ResponseWriter, r *http.Request) { return } - if len(cfg.ServiceSettings.ListenAddress) == 0 { - c.SetInvalidParam("saveConfig", "config") - return - } - - if cfg.TeamSettings.MaxUsersPerTeam == 0 { - c.SetInvalidParam("saveConfig", "config") + if err := cfg.IsValid(); err != nil { + c.Err = err return } - // TODO run some cleanup validators - utils.SaveConfig(utils.CfgFileName, cfg) utils.LoadConfig(utils.CfgFileName) json := utils.Cfg.ToJson() |