diff options
author | ᴜɴᴋɴᴡᴏɴ <u@gogs.io> | 2020-02-20 02:25:02 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-20 02:25:02 +0800 |
commit | 1c09373b4f7dbc68154c817b4ee44bfa3b3f637c (patch) | |
tree | aeec9a80d10f9ef28f0d0b128f8a84bf3cb5bdb1 /internal/auth | |
parent | 422a20648466f270de195dce3bca04e977bacd13 (diff) |
log: migrate to unknwon.dev/clog/v2 (#5927)
* Add unknwon.dev/clog/v2
* Update all places
Diffstat (limited to 'internal/auth')
-rw-r--r-- | internal/auth/auth.go | 16 | ||||
-rw-r--r-- | internal/auth/ldap/ldap.go | 12 |
2 files changed, 14 insertions, 14 deletions
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 diff --git a/internal/auth/ldap/ldap.go b/internal/auth/ldap/ldap.go index e88cef77..29d95560 100644 --- a/internal/auth/ldap/ldap.go +++ b/internal/auth/ldap/ldap.go @@ -11,8 +11,8 @@ import ( "fmt" "strings" - log "gopkg.in/clog.v1" "gopkg.in/ldap.v2" + log "unknwon.dev/clog/v2" ) type SecurityProtocol int @@ -130,7 +130,7 @@ func (ls *Source) findUserDN(l *ldap.Conn, name string) (string, bool) { userDN := sr.Entries[0].DN if userDN == "" { - log.Error(2, "LDAP: Search was successful, but found no DN!") + log.Error("LDAP: Search was successful, but found no DN!") return "", false } @@ -183,7 +183,7 @@ func (ls *Source) SearchEntry(name, passwd string, directBind bool) (string, str } l, err := dial(ls) if err != nil { - log.Error(2, "LDAP connect failed for '%s': %v", ls.Host, err) + log.Error("LDAP connect failed for '%s': %v", ls.Host, err) return "", "", "", "", false, false } defer l.Close() @@ -229,7 +229,7 @@ func (ls *Source) SearchEntry(name, passwd string, directBind bool) (string, str sr, err := l.Search(search) if err != nil { - log.Error(2, "LDAP: User search failed: %v", err) + log.Error("LDAP: User search failed: %v", err) return "", "", "", "", false, false } else if len(sr.Entries) < 1 { if directBind { @@ -266,7 +266,7 @@ func (ls *Source) SearchEntry(name, passwd string, directBind bool) (string, str srg, err := l.Search(groupSearch) if err != nil { - log.Error(2, "LDAP: Group search failed: %v", err) + log.Error("LDAP: Group search failed: %v", err) return "", "", "", "", false, false } else if len(srg.Entries) < 1 { log.Trace("LDAP: Group search returned no entries") @@ -308,7 +308,7 @@ func (ls *Source) SearchEntry(name, passwd string, directBind bool) (string, str sr, err = l.Search(search) if err != nil { - log.Error(2, "LDAP: Admin search failed: %v", err) + log.Error("LDAP: Admin search failed: %v", err) } else if len(sr.Entries) < 1 { log.Trace("LDAP: Admin search returned no entries") } else { |