From 49fe5fbf3db56fc466b8997b182ee135d7a4365d Mon Sep 17 00:00:00 2001 From: Chris Date: Mon, 25 Sep 2017 09:11:25 -0500 Subject: 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 --- app/admin.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'app/admin.go') diff --git a/app/admin.go b/app/admin.go index 022d86f3c..bd687627e 100644 --- a/app/admin.go +++ b/app/admin.go @@ -17,6 +17,7 @@ import ( "github.com/mattermost/mattermost-server/jobs" "github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/store/sqlstore" "github.com/mattermost/mattermost-server/utils" ) @@ -117,10 +118,10 @@ func (a *App) InvalidateAllCachesSkipSend() { l4g.Info(utils.T("api.context.invalidate_all_caches")) sessionCache.Purge() ClearStatusCache() - store.ClearChannelCaches() - store.ClearUserCaches() - store.ClearPostCaches() - store.ClearWebhookCaches() + sqlstore.ClearChannelCaches() + sqlstore.ClearUserCaches() + sqlstore.ClearPostCaches() + sqlstore.ClearWebhookCaches() a.LoadLicense() } @@ -187,7 +188,7 @@ func (a *App) RecycleDatabaseConnection() { oldStore := a.Srv.Store l4g.Warn(utils.T("api.admin.recycle_db_start.warn")) - a.Srv.Store = store.NewLayeredStore(a.Metrics, a.Cluster) + a.Srv.Store = store.NewLayeredStore(sqlstore.NewSqlSupplier(a.Metrics), a.Metrics, a.Cluster) jobs.Srv.Store = a.Srv.Store -- cgit v1.2.3-1-g7c22