From 1c09373b4f7dbc68154c817b4ee44bfa3b3f637c Mon Sep 17 00:00:00 2001 From: ᴜɴᴋɴᴡᴏɴ Date: Thu, 20 Feb 2020 02:25:02 +0800 Subject: log: migrate to unknwon.dev/clog/v2 (#5927) * Add unknwon.dev/clog/v2 * Update all places --- internal/auth/auth.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'internal/auth/auth.go') diff --git a/internal/auth/auth.go b/internal/auth/auth.go index 89fb1c46..41aba23d 100644 --- a/internal/auth/auth.go +++ b/internal/auth/auth.go @@ -10,8 +10,8 @@ import ( "github.com/go-macaron/session" gouuid "github.com/satori/go.uuid" - log "gopkg.in/clog.v1" "gopkg.in/macaron.v1" + log "unknwon.dev/clog/v2" "gogs.io/gogs/internal/db" "gogs.io/gogs/internal/db/errors" @@ -52,13 +52,13 @@ func SignedInID(c *macaron.Context, sess session.Store) (_ int64, isTokenAuth bo t, err := db.GetAccessTokenBySHA(tokenSHA) if err != nil { if !db.IsErrAccessTokenNotExist(err) && !db.IsErrAccessTokenEmpty(err) { - log.Error(2, "GetAccessTokenBySHA: %v", err) + log.Error("GetAccessTokenBySHA: %v", err) } return 0, false } t.Updated = time.Now() if err = db.UpdateAccessToken(t); err != nil { - log.Error(2, "UpdateAccessToken: %v", err) + log.Error("UpdateAccessToken: %v", err) } return t.UID, true } @@ -71,7 +71,7 @@ func SignedInID(c *macaron.Context, sess session.Store) (_ int64, isTokenAuth bo if id, ok := uid.(int64); ok { if _, err := db.GetUserByID(id); err != nil { if !errors.IsUserNotExist(err) { - log.Error(2, "GetUserByID: %v", err) + log.Error("GetUserByID: %v", err) } return 0, false } @@ -96,7 +96,7 @@ func SignedInUser(ctx *macaron.Context, sess session.Store) (_ *db.User, isBasic u, err := db.GetUserByName(webAuthUser) if err != nil { if !errors.IsUserNotExist(err) { - log.Error(2, "GetUserByName: %v", err) + log.Error("GetUserByName: %v", err) return nil, false, false } @@ -110,7 +110,7 @@ func SignedInUser(ctx *macaron.Context, sess session.Store) (_ *db.User, isBasic } if err = db.CreateUser(u); err != nil { // FIXME: should I create a system notice? - log.Error(2, "CreateUser: %v", err) + log.Error("CreateUser: %v", err) return nil, false, false } else { return u, false, false @@ -131,7 +131,7 @@ func SignedInUser(ctx *macaron.Context, sess session.Store) (_ *db.User, isBasic u, err := db.UserLogin(uname, passwd, -1) if err != nil { if !errors.IsUserNotExist(err) { - log.Error(2, "UserLogin: %v", err) + log.Error("UserLogin: %v", err) } return nil, false, false } @@ -144,7 +144,7 @@ func SignedInUser(ctx *macaron.Context, sess session.Store) (_ *db.User, isBasic u, err := db.GetUserByID(uid) if err != nil { - log.Error(2, "GetUserByID: %v", err) + log.Error("GetUserByID: %v", err) return nil, false, false } return u, false, isTokenAuth -- cgit v1.2.3