summaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
authorChris <ccbrown112@gmail.com>2018-01-11 15:23:41 -0600
committerCorey Hulen <corey@hulen.com>2018-01-11 13:23:41 -0800
commit1d9efd0e39a9663bb2fbf52b3353fe21ac3b6954 (patch)
tree5518bf9683e2fcbcb6b4e0acd3643a3146574ec4 /web
parent6990d052d5e95295e729aae28a0d30bfdcb98573 (diff)
downloadchat-1d9efd0e39a9663bb2fbf52b3353fe21ac3b6954.tar.gz
chat-1d9efd0e39a9663bb2fbf52b3353fe21ac3b6954.tar.bz2
chat-1d9efd0e39a9663bb2fbf52b3353fe21ac3b6954.zip
Remove global config watcher (#8080)
* remove global config watcher * keep config watcher disabled for tests * compile fix * fix resource leak
Diffstat (limited to 'web')
-rw-r--r--web/web_test.go5
1 files changed, 4 insertions, 1 deletions
diff --git a/web/web_test.go b/web/web_test.go
index 54f2aad9b..21a7968b3 100644
--- a/web/web_test.go
+++ b/web/web_test.go
@@ -38,7 +38,10 @@ func StopTestStore() {
}
func Setup() *app.App {
- a := app.New(app.StoreOverride(testStore))
+ a, err := app.New(app.StoreOverride(testStore), app.DisableConfigWatch)
+ if err != nil {
+ panic(err)
+ }
prevListenAddress := *a.Config().ServiceSettings.ListenAddress
a.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.ListenAddress = ":0" })
a.StartServer()