diff options
| author | Harrison Healey <harrisonmhealey@gmail.com> | 2017-05-23 11:06:25 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-23 11:06:25 -0400 |
| commit | 5c1049054eace710abd3418bbad141fbb7dd5d7f (patch) | |
| tree | 24d75c14ce2aae2c6f1a8d5bc7392e958e416666 /web | |
| parent | 69f3f2fdce4ae21a037ca61d753279efcc70f0ec (diff) | |
| download | chat-5c1049054eace710abd3418bbad141fbb7dd5d7f.tar.gz chat-5c1049054eace710abd3418bbad141fbb7dd5d7f.tar.bz2 chat-5c1049054eace710abd3418bbad141fbb7dd5d7f.zip | |
PLT-6471 Properly panic when translations can't be loaded (#6414)
* PLT-6471 Properly panic when translations can't be loaded
* Print usage messages when errors occur during CLI initialization
* Reverted behaviour of FindDir and added second return value to it
* Fixed merge conflict
Diffstat (limited to 'web')
| -rw-r--r-- | web/web.go | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/web/web.go b/web/web.go index 8155f2016..e70129221 100644 --- a/web/web.go +++ b/web/web.go @@ -23,7 +23,7 @@ func InitWeb() { mainrouter := app.Srv.Router if *utils.Cfg.ServiceSettings.WebserverMode != "disabled" { - staticDir := utils.FindDir(model.CLIENT_DIR) + staticDir, _ := utils.FindDir(model.CLIENT_DIR) l4g.Debug("Using client directory at %v", staticDir) if *utils.Cfg.ServiceSettings.WebserverMode == "gzip" { mainrouter.PathPrefix("/static/").Handler(gziphandler.GzipHandler(staticHandler(http.StripPrefix("/static/", http.FileServer(http.Dir(staticDir)))))) @@ -79,5 +79,7 @@ func root(c *api.Context, w http.ResponseWriter, r *http.Request) { } w.Header().Set("Cache-Control", "no-cache, max-age=31556926, public") - http.ServeFile(w, r, utils.FindDir(model.CLIENT_DIR)+"root.html") + + staticDir, _ := utils.FindDir(model.CLIENT_DIR) + http.ServeFile(w, r, staticDir+"root.html") } |