From bff2b5e735ae7fc80157b4108ddbe56be8acb752 Mon Sep 17 00:00:00 2001 From: Chris Date: Mon, 9 Oct 2017 14:59:48 -0700 Subject: Miscellaneous app cleanup (#7594) * app cleanup * whoops, forgot a file * some minor cleanup * longer container deadline * defensive checks --- app/admin.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'app/admin.go') diff --git a/app/admin.go b/app/admin.go index a3f7ffa2a..5994fc826 100644 --- a/app/admin.go +++ b/app/admin.go @@ -15,7 +15,6 @@ import ( l4g "github.com/alecthomas/log4go" "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" ) @@ -187,12 +186,13 @@ func (a *App) RecycleDatabaseConnection() { oldStore := a.Srv.Store l4g.Warn(utils.T("api.admin.recycle_db_start.warn")) - a.Srv.Store = store.NewLayeredStore(sqlstore.NewSqlSupplier(utils.Cfg.SqlSettings, a.Metrics), a.Metrics, a.Cluster) - + a.Srv.Store = a.newStore() a.Jobs.Store = a.Srv.Store - time.Sleep(20 * time.Second) - oldStore.Close() + if a.Srv.Store != oldStore { + time.Sleep(20 * time.Second) + oldStore.Close() + } l4g.Warn(utils.T("api.admin.recycle_db_end.warn")) } -- cgit v1.2.3-1-g7c22