diff options
| author | Chris <ccbrown112@gmail.com> | 2017-09-25 09:11:25 -0500 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2017-09-25 10:11:25 -0400 |
| commit | 49fe5fbf3db56fc466b8997b182ee135d7a4365d (patch) | |
| tree | 1252fea09aa3ce899e2e8edb1fb7b42900f50bca /cmd/platform | |
| parent | b2c5b97601b61f5748b46e4e386134203111ebb0 (diff) | |
| download | chat-49fe5fbf3db56fc466b8997b182ee135d7a4365d.tar.gz chat-49fe5fbf3db56fc466b8997b182ee135d7a4365d.tar.bz2 chat-49fe5fbf3db56fc466b8997b182ee135d7a4365d.zip | |
Move sql store code into store/sqlstore package (#7502)
* move sql store code into store/sqlstore package
* move non-sql constants back up to store
* fix api test
* derp
Diffstat (limited to 'cmd/platform')
| -rw-r--r-- | cmd/platform/jobserver.go | 3 | ||||
| -rw-r--r-- | cmd/platform/version.go | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/cmd/platform/jobserver.go b/cmd/platform/jobserver.go index 24a229552..6d4e828bd 100644 --- a/cmd/platform/jobserver.go +++ b/cmd/platform/jobserver.go @@ -10,6 +10,7 @@ import ( l4g "github.com/alecthomas/log4go" "github.com/mattermost/mattermost-server/jobs" "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/store/sqlstore" "github.com/spf13/cobra" ) @@ -36,7 +37,7 @@ func jobserverCmdF(cmd *cobra.Command, args []string) { } defer l4g.Close() - jobs.Srv.Store = store.NewLayeredStore(a.Metrics, a.Cluster) + jobs.Srv.Store = store.NewLayeredStore(sqlstore.NewSqlSupplier(a.Metrics), a.Metrics, a.Cluster) defer jobs.Srv.Store.Close() jobs.Srv.LoadLicense() diff --git a/cmd/platform/version.go b/cmd/platform/version.go index c34254c45..9616be1d7 100644 --- a/cmd/platform/version.go +++ b/cmd/platform/version.go @@ -6,6 +6,7 @@ import ( "github.com/mattermost/mattermost-server/app" "github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/store/sqlstore" "github.com/spf13/cobra" ) @@ -32,5 +33,7 @@ func printVersion(a *app.App) { CommandPrintln("Build Date: " + model.BuildDate) CommandPrintln("Build Hash: " + model.BuildHash) CommandPrintln("Build Enterprise Ready: " + model.BuildEnterpriseReady) - CommandPrintln("DB Version: " + a.Srv.Store.(*store.LayeredStore).DatabaseLayer.GetCurrentSchemaVersion()) + if supplier, ok := a.Srv.Store.(*store.LayeredStore).DatabaseLayer.(*sqlstore.SqlSupplier); ok { + CommandPrintln("DB Version: " + supplier.GetCurrentSchemaVersion()) + } } |