From 816a30397da6ceff836d8723233dc5cdbda70871 Mon Sep 17 00:00:00 2001 From: Chris Date: Tue, 21 Nov 2017 13:08:32 -0600 Subject: Role refactor (#7867) * role refactor * add missing file * fix web test --- app/app.go | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'app/app.go') diff --git a/app/app.go b/app/app.go index 55fb43b30..ea79d8e81 100644 --- a/app/app.go +++ b/app/app.go @@ -55,6 +55,8 @@ type App struct { htmlTemplateWatcher *utils.HTMLTemplateWatcher sessionCache *utils.Cache + roles map[string]*model.Role + configListenerId string } var appCount = 0 @@ -86,6 +88,11 @@ func New(options ...Option) *App { utils.LoadGlobalConfig(app.configFile) utils.InitTranslations(utils.Cfg.LocalizationSettings) + app.configListenerId = utils.AddConfigListener(func(_, cfg *model.Config) { + app.SetDefaultRolesBasedOnConfig() + }) + app.SetDefaultRolesBasedOnConfig() + l4g.Info(utils.T("api.server.new_server.init.info")) app.initEnterprise() @@ -137,6 +144,7 @@ func (a *App) Shutdown() { a.htmlTemplateWatcher.Close() } + utils.RemoveConfigListener(a.configListenerId) l4g.Info(utils.T("api.server.stop_server.stopped.info")) } -- cgit v1.2.3-1-g7c22