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 /api4/oauth.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 'api4/oauth.go')
| -rw-r--r-- | api4/oauth.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/api4/oauth.go b/api4/oauth.go index a173159b6..fa120ebbf 100644 --- a/api4/oauth.go +++ b/api4/oauth.go @@ -9,8 +9,8 @@ import ( "path/filepath" "strings" - l4g "github.com/alecthomas/log4go" "github.com/mattermost/mattermost-server/app" + "github.com/mattermost/mattermost-server/mlog" "github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/utils" ) @@ -463,7 +463,7 @@ func completeOAuth(c *Context, w http.ResponseWriter, r *http.Request) { if err != nil { err.Translate(c.T) - l4g.Error(err.Error()) + mlog.Error(err.Error()) if action == model.OAUTH_ACTION_MOBILE { w.Write([]byte(err.ToJson())) } else { @@ -475,7 +475,7 @@ func completeOAuth(c *Context, w http.ResponseWriter, r *http.Request) { user, err := c.App.CompleteOAuth(service, body, teamId, props) if err != nil { err.Translate(c.T) - l4g.Error(err.Error()) + mlog.Error(err.Error()) if action == model.OAUTH_ACTION_MOBILE { w.Write([]byte(err.ToJson())) } else { |