diff options
| author | Christopher Speller <crspeller@gmail.com> | 2018-04-27 12:49:45 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-27 12:49:45 -0700 |
| commit | 686c2fbab7607d42183ae685a27ea3d7dce8c3f6 (patch) | |
| tree | 53ed73cada57bc43f342ac10e2f842cddb095218 /app/oauth.go | |
| parent | 2acbc77d78456d7ba76ceb687b18985d7d92f814 (diff) | |
| download | chat-686c2fbab7607d42183ae685a27ea3d7dce8c3f6.tar.gz chat-686c2fbab7607d42183ae685a27ea3d7dce8c3f6.tar.bz2 chat-686c2fbab7607d42183ae685a27ea3d7dce8c3f6.zip | |
Structured logging (#8673)
* Implementing structured logging
* Changes to en.json to allow refactor to run.
* Fixing global logger
* Structured logger initalization.
* Add caller.
* Do some log redirection.
* Auto refactor
* Cleaning up l4g reference and removing dependancy.
* Removing junk.
* Copyright headers.
* Fixing tests
* Revert "Changes to en.json to allow refactor to run."
This reverts commit fd8249e99bcad0231e6ea65cd77c32aae9a54026.
* Fixing some auto refactor strangeness and typo.
* Making keys more human readable.
Diffstat (limited to 'app/oauth.go')
| -rw-r--r-- | app/oauth.go | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/app/oauth.go b/app/oauth.go index 630fd3e2d..13fbd5a73 100644 --- a/app/oauth.go +++ b/app/oauth.go @@ -6,14 +6,15 @@ package app import ( "bytes" b64 "encoding/base64" + "fmt" "io" "net/http" "net/url" "strings" "time" - l4g "github.com/alecthomas/log4go" "github.com/mattermost/mattermost-server/einterfaces" + "github.com/mattermost/mattermost-server/mlog" "github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/store" "github.com/mattermost/mattermost-server/utils" @@ -226,7 +227,7 @@ func (a *App) GetOAuthAccessToken(clientId, grantType, redirectUri, code, secret accessData = &model.AccessData{ClientId: clientId, UserId: user.Id, Token: session.Token, RefreshToken: model.NewId(), RedirectUri: redirectUri, ExpiresAt: session.ExpiresAt, Scope: authData.Scope} if result := <-a.Srv.Store.OAuth().SaveAccessData(accessData); result.Err != nil { - l4g.Error(result.Err) + mlog.Error(fmt.Sprint(result.Err)) return nil, model.NewAppError("GetOAuthAccessToken", "api.oauth.get_access_token.internal_saving.app_error", nil, "", http.StatusInternalServerError) } @@ -295,7 +296,7 @@ func (a *App) newSessionUpdateToken(appName string, accessData *model.AccessData accessData.RefreshToken = model.NewId() accessData.ExpiresAt = session.ExpiresAt if result := <-a.Srv.Store.OAuth().UpdateAccessData(accessData); result.Err != nil { - l4g.Error(result.Err) + mlog.Error(fmt.Sprint(result.Err)) return nil, model.NewAppError("newSessionUpdateToken", "web.get_access_token.internal_saving.app_error", nil, "", http.StatusInternalServerError) } accessRsp := &model.AccessResponse{ @@ -528,7 +529,7 @@ func (a *App) CompleteSwitchWithOAuth(service string, userData io.ReadCloser, em a.Go(func() { if err := a.SendSignInChangeEmail(user.Email, strings.Title(service)+" SSO", user.Locale, a.GetSiteURL()); err != nil { - l4g.Error(err.Error()) + mlog.Error(err.Error()) } }) @@ -774,7 +775,7 @@ func (a *App) SwitchOAuthToEmail(email, password, requesterId string) (string, * a.Go(func() { if err := a.SendSignInChangeEmail(user.Email, T("api.templates.signin_change_email.body.method_email"), user.Locale, a.GetSiteURL()); err != nil { - l4g.Error(err.Error()) + mlog.Error(err.Error()) } }) |