diff options
author | Harrison Healey <harrisonmhealey@gmail.com> | 2017-05-18 15:05:57 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-18 15:05:57 -0400 |
commit | 577ed27f1bb060080d311342047e31943a02ccbb (patch) | |
tree | ad57fa69b1daf143e914ea2480a475e5450cc236 /utils/config.go | |
parent | 920bc0d8712a50691b1f698779f60132536eb214 (diff) | |
download | chat-577ed27f1bb060080d311342047e31943a02ccbb.tar.gz chat-577ed27f1bb060080d311342047e31943a02ccbb.tar.bz2 chat-577ed27f1bb060080d311342047e31943a02ccbb.zip |
PLT-6408 Framework for job server (#6404)
* Added initial job server
* Added job server to be ran as part of platform
* Added test job to the enterprise repo
* Fixed job server not loading license
* Renamed job package to jobs
* Fixed TE not being buildable
* Added JobStatus table to database
* Changed fields used by JobStatus
* Added APIs to query job status
* Added config change listener to server
* Added option to run job server from Makefile
* Added ability to enable/disable jobs from config
* Commented out placeholder for search indexing job
* Fixed govet
* Removed debug messages and fixed job api init message
Diffstat (limited to 'utils/config.go')
-rw-r--r-- | utils/config.go | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/utils/config.go b/utils/config.go index 234acae11..95cfc43aa 100644 --- a/utils/config.go +++ b/utils/config.go @@ -50,6 +50,22 @@ func SetSiteURL(url string) { siteURL = strings.TrimRight(url, "/") } +var cfgListeners = map[string]func(*model.Config, *model.Config){} + +// Registers a function with a given to be called when the config is reloaded and may have changed. The function +// will be called with two arguments: the old config and the new config. AddConfigListener returns a unique ID +// for the listener that can later be used to remove it. +func AddConfigListener(listener func(*model.Config, *model.Config)) string { + id := model.NewId() + cfgListeners[id] = listener + return id +} + +// Removes a listener function by the unique ID returned when AddConfigListener was called +func RemoveConfigListener(id string) { + delete(cfgListeners, id) +} + func FindConfigFile(fileName string) string { if _, err := os.Stat("./config/" + fileName); err == nil { fileName, _ = filepath.Abs("./config/" + fileName) @@ -242,6 +258,21 @@ func DisableConfigWatch() { } } +func InitAndLoadConfig(filename string) (err string) { + defer func() { + if r := recover(); r != nil { + err = fmt.Sprintf("%v", r) + } + }() + TranslationsPreInit() + EnableConfigFromEnviromentVars() + LoadConfig(filename) + InitializeConfigWatch() + EnableConfigWatch() + + return "" +} + // LoadConfig will try to search around for the corresponding config file. // It will search /tmp/fileName then attempt ./config/fileName, // then ../config/fileName and last it will look at fileName @@ -249,6 +280,9 @@ func LoadConfig(fileName string) { cfgMutex.Lock() defer cfgMutex.Unlock() + // Cfg should never be null + oldConfig := *Cfg + fileNameWithExtension := filepath.Base(fileName) fileExtension := filepath.Ext(fileNameWithExtension) fileDir := filepath.Dir(fileName) @@ -339,6 +373,10 @@ func LoadConfig(fileName string) { SetDefaultRolesBasedOnConfig() SetSiteURL(*Cfg.ServiceSettings.SiteURL) + + for _, listener := range cfgListeners { + listener(&oldConfig, &config) + } } func RegenerateClientConfig() { |