summaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
Diffstat (limited to 'web')
-rw-r--r--web/web.go2
-rw-r--r--web/web_test.go5
2 files changed, 2 insertions, 5 deletions
diff --git a/web/web.go b/web/web.go
index e0edd1b7a..321d83a75 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(c.App, w, r)
+ api.Handle404(w, r)
return
}
diff --git a/web/web_test.go b/web/web_test.go
index c8d64c61d..21a7968b3 100644
--- a/web/web_test.go
+++ b/web/web_test.go
@@ -44,10 +44,7 @@ func Setup() *app.App {
}
prevListenAddress := *a.Config().ServiceSettings.ListenAddress
a.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.ListenAddress = ":0" })
- serverErr := a.StartServer()
- if serverErr != nil {
- panic(serverErr)
- }
+ a.StartServer()
a.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.ListenAddress = prevListenAddress })
api4.Init(a, a.Srv.Router, false)
api3 := api.Init(a, a.Srv.Router)