USEFULL
/
gogs
mirror of https://github.com/gogs/gogs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve error handling

pull/3785/merge
Unknwon 2017-02-15 12:35:24 -05:00
parent a4f9e5031f
commit 40bce6310c
No known key found for this signature in database
GPG Key ID: 25B575AE3213B2B3
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/auth/auth.go
View File

@ -49,14 +49,14 @@ func SignedInID(ctx *macaron.Context, sess session.Store) int64 {
if len(tokenSHA) > 0 { if len(tokenSHA) > 0 {
t, err := models.GetAccessTokenBySHA(tokenSHA) t, err := models.GetAccessTokenBySHA(tokenSHA)
if err != nil { if err != nil {
if models.IsErrAccessTokenNotExist(err) || models.IsErrAccessTokenEmpty(err) { if !models.IsErrAccessTokenNotExist(err) && !models.IsErrAccessTokenEmpty(err) {
log.Error(4, "GetAccessTokenBySHA: %v", err) log.Error(2, "GetAccessTokenBySHA: %v", err)
} }
return 0 return 0
} }
t.Updated = time.Now() t.Updated = time.Now()
if err = models.UpdateAccessToken(t); err != nil { if err = models.UpdateAccessToken(t); err != nil {
log.Error(4, "UpdateAccessToken: %v", err) log.Error(2, "UpdateAccessToken: %v", err)
} }
return t.UID return t.UID
} }
@ -69,7 +69,7 @@ func SignedInID(ctx *macaron.Context, sess session.Store) int64 {
if id, ok := uid.(int64); ok { if id, ok := uid.(int64); ok {
if _, err := models.GetUserByID(id); err != nil { if _, err := models.GetUserByID(id); err != nil {
if !models.IsErrUserNotExist(err) { if !models.IsErrUserNotExist(err) {
log.Error(4, "GetUserById: %v", err) log.Error(2, "GetUserById: %v", err)
} }
return 0 return 0
} }