diff options
| author | Harrison Healey <harrisonmhealey@gmail.com> | 2018-04-09 12:16:11 -0400 |
|---|---|---|
| committer | Jesús Espino <jespinog@gmail.com> | 2018-04-09 18:16:11 +0200 |
| commit | 0a6b96cb40d9dd5acca7e366df9cd14fa4eff6a7 (patch) | |
| tree | 4b46ef4dc50aed2171d3b5ec38117a148db7ae29 /app/admin.go | |
| parent | 57ee6f505e1b231733dc73dc25d2fbe14bd6b7d5 (diff) | |
| download | chat-0a6b96cb40d9dd5acca7e366df9cd14fa4eff6a7.tar.gz chat-0a6b96cb40d9dd5acca7e366df9cd14fa4eff6a7.tar.bz2 chat-0a6b96cb40d9dd5acca7e366df9cd14fa4eff6a7.zip | |
MM-9849 Added tracking of which settings are set through environment variables (#8586)
* MM-9849 Added tracking of which settings are set through environment variables
* Removed old version of viper
* Added forked version of viper
* Fixed unit tests
* Fixed more unit tests
* Removed copy from App.GetEnvironmentConfig
Diffstat (limited to 'app/admin.go')
| -rw-r--r-- | app/admin.go | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/admin.go b/app/admin.go index 22928390e..299a8f057 100644 --- a/app/admin.go +++ b/app/admin.go @@ -156,6 +156,10 @@ func (a *App) GetConfig() *model.Config { return cfg } +func (a *App) GetEnvironmentConfig() map[string]interface{} { + return a.EnvironmentConfig() +} + func (a *App) SaveConfig(cfg *model.Config, sendConfigChangeClusterMessage bool) *model.AppError { oldCfg := a.Config() cfg.SetDefaults() |