From eb1a00ef5f93b19c2d49b26de057ee2c51c09e45 Mon Sep 17 00:00:00 2001 From: Chris Date: Thu, 16 Nov 2017 15:04:27 -0600 Subject: Reorganize file util functionality (#7848) * reorganize file util functionality * fix api test compilation * fix rebase issue --- cmd/platform/server.go | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'cmd') 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() } -- cgit v1.2.3-1-g7c22