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/route/user | |
| parent | 422a20648466f270de195dce3bca04e977bacd13 (diff) | |
log: migrate to unknwon.dev/clog/v2 (#5927)
* Add unknwon.dev/clog/v2
* Update all places
Diffstat (limited to 'internal/route/user')
| -rw-r--r-- | internal/route/user/auth.go | 10 | ||||
| -rw-r--r-- | internal/route/user/setting.go | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/internal/route/user/auth.go b/internal/route/user/auth.go index 3613297b..d2fcee83 100644 --- a/internal/route/user/auth.go +++ b/internal/route/user/auth.go @@ -9,7 +9,7 @@ import ( "net/url" "github.com/go-macaron/captcha" - log "gopkg.in/clog.v1" + log "unknwon.dev/clog/v2" "gogs.io/gogs/internal/context" "gogs.io/gogs/internal/db" @@ -239,7 +239,7 @@ func LoginTwoFactorPost(c *context.Context) { return } if err = c.Cache.Put(u.TwoFactorCacheKey(passcode), 1, 60); err != nil { - log.Error(2, "Failed to put cache 'two factor passcode': %v", err) + log.Error("Failed to put cache 'two factor passcode': %v", err) } afterLogin(c, u, c.Session.Get("twoFactorRemember").(bool)) @@ -376,7 +376,7 @@ func SignUpPost(c *context.Context, cpt *captcha.Captcha, f form.Register) { c.Success(ACTIVATE) if err := c.Cache.Put(u.MailResendCacheKey(), 1, 180); err != nil { - log.Error(2, "Failed to put cache key 'mail resend': %v", err) + log.Error("Failed to put cache key 'mail resend': %v", err) } return } @@ -401,7 +401,7 @@ func Activate(c *context.Context) { mailer.SendActivateAccountMail(c.Context, db.NewMailerUser(c.User)) if err := c.Cache.Put(c.User.MailResendCacheKey(), 1, 180); err != nil { - log.Error(2, "Failed to put cache key 'mail resend': %v", err) + log.Error("Failed to put cache key 'mail resend': %v", err) } } } else { @@ -506,7 +506,7 @@ func ForgotPasswdPost(c *context.Context) { mailer.SendResetPasswordMail(c.Context, db.NewMailerUser(u)) if err = c.Cache.Put(u.MailResendCacheKey(), 1, 180); err != nil { - log.Error(2, "Failed to put cache key 'mail resend': %v", err) + log.Error("Failed to put cache key 'mail resend': %v", err) } c.Data["Hours"] = setting.Service.ActiveCodeLives / 60 diff --git a/internal/route/user/setting.go b/internal/route/user/setting.go index 7c1c4696..ef0bf5cc 100644 --- a/internal/route/user/setting.go +++ b/internal/route/user/setting.go @@ -16,7 +16,7 @@ import ( "github.com/pquerna/otp" "github.com/pquerna/otp/totp" "github.com/unknwon/com" - log "gopkg.in/clog.v1" + log "unknwon.dev/clog/v2" "gogs.io/gogs/internal/context" "gogs.io/gogs/internal/db" @@ -144,7 +144,7 @@ func UpdateAvatarSetting(c *context.Context, f form.Avatar, ctxUser *db.User) er // generate a random one when needed. if ctxUser.UseCustomAvatar && !com.IsFile(ctxUser.CustomAvatarPath()) { if err := ctxUser.GenerateRandomAvatar(); err != nil { - log.Error(2, "generate random avatar [%d]: %v", ctxUser.ID, err) + log.Error("generate random avatar [%d]: %v", ctxUser.ID, err) } } } @@ -278,7 +278,7 @@ func SettingsEmailPost(c *context.Context, f form.AddEmail) { mailer.SendActivateEmailMail(c.Context, db.NewMailerUser(c.User), email.Email) if err := c.Cache.Put("MailResendLimit_"+c.User.LowerName, c.User.LowerName, 180); err != nil { - log.Error(2, "Set cache 'MailResendLimit' failed: %v", err) + log.Error("Set cache 'MailResendLimit' failed: %v", err) } c.Flash.Info(c.Tr("settings.add_email_confirmation_sent", email.Email, setting.Service.ActiveCodeLives/60)) } else { |