diff options
| author | Chris <ccbrown112@gmail.com> | 2017-11-16 15:04:27 -0600 |
|---|---|---|
| committer | Jonathan <jonfritz@gmail.com> | 2017-11-16 16:04:27 -0500 |
| commit | eb1a00ef5f93b19c2d49b26de057ee2c51c09e45 (patch) | |
| tree | e63afa695283e15c5cd9ee2a437d74024dcc5c20 /cmd/platform | |
| parent | ef69d93abfb192bc7a2416f3cf2622d99fd27dd5 (diff) | |
| download | chat-eb1a00ef5f93b19c2d49b26de057ee2c51c09e45.tar.gz chat-eb1a00ef5f93b19c2d49b26de057ee2c51c09e45.tar.bz2 chat-eb1a00ef5f93b19c2d49b26de057ee2c51c09e45.zip | |
Reorganize file util functionality (#7848)
* reorganize file util functionality
* fix api test compilation
* fix rebase issue
Diffstat (limited to 'cmd/platform')
| -rw-r--r-- | cmd/platform/server.go | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/cmd/platform/server.go b/cmd/platform/server.go index 36118d007..51f5fa67e 100644 --- a/cmd/platform/server.go +++ b/cmd/platform/server.go @@ -60,13 +60,17 @@ func runServer(configFileLocation string) { l4g.Info(utils.T("mattermost.working_dir"), pwd) l4g.Info(utils.T("mattermost.config_file"), utils.FindConfigFile(configFileLocation)) - if err := utils.TestFileConnection(); err != nil { - l4g.Error("Problem with file storage settings: " + err.Error()) - } - a := app.New(app.ConfigFile(configFileLocation)) defer a.Shutdown() + backend, err := a.FileBackend() + if err == nil { + err = backend.TestConnection() + } + if err != nil { + l4g.Error("Problem with file storage settings: " + err.Error()) + } + if model.BuildEnterpriseReady == "true" { a.LoadLicense() } |