summaryrefslogtreecommitdiffstats
path: root/app/app.go
diff options
context:
space:
mode:
authorChris <ccbrown112@gmail.com>2017-10-16 08:09:43 -0700
committerJoram Wilander <jwawilander@gmail.com>2017-10-16 11:09:43 -0400
commit34285d8cca93fc0f473636e78680fade03f26bda (patch)
treeb8274ed8d17e5dc63ac36aadac7e7299635d2b43 /app/app.go
parentadb2b1d6eddabea803af8fa6cf53a75c98694427 (diff)
downloadchat-34285d8cca93fc0f473636e78680fade03f26bda.tar.gz
chat-34285d8cca93fc0f473636e78680fade03f26bda.tar.bz2
chat-34285d8cca93fc0f473636e78680fade03f26bda.zip
parallel tests (#7629)
Diffstat (limited to 'app/app.go')
-rw-r--r--app/app.go8
1 files changed, 6 insertions, 2 deletions
diff --git a/app/app.go b/app/app.go
index 7b6499b1f..34c0721a0 100644
--- a/app/app.go
+++ b/app/app.go
@@ -47,7 +47,8 @@ type App struct {
Mfa einterfaces.MfaInterface
Saml einterfaces.SamlInterface
- newStore func() store.Store
+ newStore func() store.Store
+ configOverride func(*model.Config) *model.Config
}
var appCount = 0
@@ -77,7 +78,7 @@ func New(options ...Option) *App {
if app.newStore == nil {
app.newStore = func() store.Store {
- return store.NewLayeredStore(sqlstore.NewSqlSupplier(utils.Cfg.SqlSettings, app.Metrics), app.Metrics, app.Cluster)
+ return store.NewLayeredStore(sqlstore.NewSqlSupplier(app.Config().SqlSettings, app.Metrics), app.Metrics, app.Cluster)
}
}
@@ -233,6 +234,9 @@ func (a *App) initEnterprise() {
}
func (a *App) Config() *model.Config {
+ if a.configOverride != nil {
+ return a.configOverride(utils.Cfg)
+ }
return utils.Cfg
}