diff options
author | Christopher Speller <crspeller@gmail.com> | 2018-04-27 14:12:01 -0700 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2018-04-27 14:12:01 -0700 |
commit | eb9ff34fcfa51cd8205841a02f3d3d61ec5be8fa (patch) | |
tree | ed01fd9488bd86f6c2daf0b299dff5beb43973db /web/web.go | |
parent | 2386acb3ddabd8827e21b1862c338a8b13a25de6 (diff) | |
parent | 2e6b3da1d3466db379fef0d61a23e2878d17ee9d (diff) | |
download | chat-eb9ff34fcfa51cd8205841a02f3d3d61ec5be8fa.tar.gz chat-eb9ff34fcfa51cd8205841a02f3d3d61ec5be8fa.tar.bz2 chat-eb9ff34fcfa51cd8205841a02f3d3d61ec5be8fa.zip |
Merge branch 'master' into advanced-permissions-phase-2
Diffstat (limited to 'web/web.go')
-rw-r--r-- | web/web.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/web/web.go b/web/web.go index c9d318397..56a5ab6ac 100644 --- a/web/web.go +++ b/web/web.go @@ -4,6 +4,7 @@ package web import ( + "fmt" "net/http" "path/filepath" "strings" @@ -11,20 +12,20 @@ import ( "github.com/NYTimes/gziphandler" "github.com/avct/uasurfer" - l4g "github.com/alecthomas/log4go" "github.com/mattermost/mattermost-server/api" + "github.com/mattermost/mattermost-server/mlog" "github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/utils" ) func Init(api3 *api.API) { - l4g.Debug(utils.T("web.init.debug")) + mlog.Debug("Initializing web routes") mainrouter := api3.BaseRoutes.Root if *api3.App.Config().ServiceSettings.WebserverMode != "disabled" { staticDir, _ := utils.FindDir(model.CLIENT_DIR) - l4g.Debug("Using client directory at %v", staticDir) + mlog.Debug(fmt.Sprintf("Using client directory at %v", staticDir)) staticHandler := staticHandler(http.StripPrefix("/static/", http.FileServer(http.Dir(staticDir)))) pluginHandler := pluginHandler(api3.App.Config, http.StripPrefix("/static/plugins/", http.FileServer(http.Dir(*api3.App.Config().PluginSettings.ClientDirectory)))) |