diff options
author | Chris <ccbrown112@gmail.com> | 2018-02-12 12:02:54 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-12 12:02:54 -0600 |
commit | 1ae680aefae2deb1e9d07d7c2a1c863ec807a79f (patch) | |
tree | a99a74d6b858d73624c06f85e393acbe97c90586 /web | |
parent | 9707ac3aaf2cb4352c573aadf54b8535e237dd9e (diff) | |
parent | 07fd7aeeb8eb2b198b01b713a4ab57f6352faef2 (diff) | |
download | chat-1ae680aefae2deb1e9d07d7c2a1c863ec807a79f.tar.gz chat-1ae680aefae2deb1e9d07d7c2a1c863ec807a79f.tar.bz2 chat-1ae680aefae2deb1e9d07d7c2a1c863ec807a79f.zip |
Merge branch 'master' into release-4.7
Diffstat (limited to 'web')
-rw-r--r-- | web/web.go | 2 | ||||
-rw-r--r-- | web/web_test.go | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/web/web.go b/web/web.go index 321d83a75..e0edd1b7a 100644 --- a/web/web.go +++ b/web/web.go @@ -94,7 +94,7 @@ func root(c *api.Context, w http.ResponseWriter, r *http.Request) { } if api.IsApiCall(r) { - api.Handle404(w, r) + api.Handle404(c.App, w, r) return } diff --git a/web/web_test.go b/web/web_test.go index 21a7968b3..c8d64c61d 100644 --- a/web/web_test.go +++ b/web/web_test.go @@ -44,7 +44,10 @@ func Setup() *app.App { } prevListenAddress := *a.Config().ServiceSettings.ListenAddress a.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.ListenAddress = ":0" }) - a.StartServer() + serverErr := a.StartServer() + if serverErr != nil { + panic(serverErr) + } a.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.ListenAddress = prevListenAddress }) api4.Init(a, a.Srv.Router, false) api3 := api.Init(a, a.Srv.Router) |