Miscellaneous app cleanup (#7594)

* app cleanup

* whoops, forgot a file

* some minor cleanup

* longer container deadline

* defensive checks

4 files changed, 4 insertions, 22 deletions

diff --git a/cmd/platform/init.go b/cmd/platform/init.go
index 2f41b2ad6..145c754d1 100644
--- a/cmd/platform/init.go
+++ b/cmd/platform/init.go
@@ -30,8 +30,6 @@ func initDBCommandContext(configFileLocation string) (*app.App, error) {
 	utils.ConfigureCmdLineLog()
 
 	a := app.New()
-	a.NewServer()
-	a.InitStores()
 	if model.BuildEnterpriseReady == "true" {
 		a.LoadLicense()
 	}
diff --git a/cmd/platform/jobserver.go b/cmd/platform/jobserver.go
index f265f137b..c38bfa4f0 100644
--- a/cmd/platform/jobserver.go
+++ b/cmd/platform/jobserver.go
@@ -8,9 +8,6 @@ import (
 	"syscall"
 
 	l4g "github.com/alecthomas/log4go"
-	"github.com/mattermost/mattermost-server/store"
-	"github.com/mattermost/mattermost-server/store/sqlstore"
-	"github.com/mattermost/mattermost-server/utils"
 	"github.com/spf13/cobra"
 )
 
@@ -36,9 +33,7 @@ func jobserverCmdF(cmd *cobra.Command, args []string) {
 		panic(err.Error())
 	}
 	defer l4g.Close()
-
-	a.Jobs.Store = store.NewLayeredStore(sqlstore.NewSqlSupplier(utils.Cfg.SqlSettings, a.Metrics), a.Metrics, a.Cluster)
-	defer a.Jobs.Store.Close()
+	defer a.Shutdown()
 
 	a.Jobs.LoadLicense()
 
diff --git a/cmd/platform/server.go b/cmd/platform/server.go
index ac3f645c2..591a27457 100644
--- a/cmd/platform/server.go
+++ b/cmd/platform/server.go
@@ -67,11 +67,6 @@ func runServer(configFileLocation string) {
 	a := app.New()
 	defer a.Shutdown()
 
-	a.NewServer()
-	a.InitStores()
-	a.Srv.Router = api.NewRouter()
-	a.Srv.WebSocketRouter = a.NewWebSocketRouter()
-
 	if model.BuildEnterpriseReady == "true" {
 		a.LoadLicense()
 	}
@@ -92,6 +87,7 @@ func runServer(configFileLocation string) {
 		l4g.Error("Unable to find webapp directory, could not initialize plugins")
 	}
 
+	a.StartServer()
 	api4.Init(a, a.Srv.Router, false)
 	api3 := api.Init(a, a.Srv.Router)
 	wsapi.Init(a, a.Srv.WebSocketRouter)
@@ -115,8 +111,6 @@ func runServer(configFileLocation string) {
 
 	resetStatuses(a)
 
-	a.StartServer()
-
 	// If we allow testing then listen for manual testing URL hits
 	if utils.Cfg.ServiceSettings.EnableTesting {
 		manualtesting.Init(api3)
@@ -149,7 +143,6 @@ func runServer(configFileLocation string) {
 		}
 	}
 
-	a.Jobs.Store = a.Srv.Store
 	if *utils.Cfg.JobSettings.RunJobs {
 		a.Jobs.StartWorkers()
 	}
diff --git a/cmd/platform/test.go b/cmd/platform/test.go
index 7e8b9cf0f..08438e034 100644
--- a/cmd/platform/test.go
+++ b/cmd/platform/test.go
@@ -52,13 +52,11 @@ func webClientTestsCmdF(cmd *cobra.Command, args []string) error {
 	defer a.Shutdown()
 
 	utils.InitTranslations(utils.Cfg.LocalizationSettings)
-	a.Srv.Router = api.NewRouter()
-	a.Srv.WebSocketRouter = a.NewWebSocketRouter()
+	a.StartServer()
 	api4.Init(a, a.Srv.Router, false)
 	api.Init(a, a.Srv.Router)
 	wsapi.Init(a, a.Srv.WebSocketRouter)
 	setupClientTests()
-	a.StartServer()
 	runWebClientTests()
 
 	return nil
@@ -72,13 +70,11 @@ func serverForWebClientTestsCmdF(cmd *cobra.Command, args []string) error {
 	defer a.Shutdown()
 
 	utils.InitTranslations(utils.Cfg.LocalizationSettings)
-	a.Srv.Router = api.NewRouter()
-	a.Srv.WebSocketRouter = a.NewWebSocketRouter()
+	a.StartServer()
 	api4.Init(a, a.Srv.Router, false)
 	api.Init(a, a.Srv.Router)
 	wsapi.Init(a, a.Srv.WebSocketRouter)
 	setupClientTests()
-	a.StartServer()
 
 	c := make(chan os.Signal)
 	signal.Notify(c, os.Interrupt, syscall.SIGINT, syscall.SIGTERM)