diff options
author | zeripath <art27@cantab.net> | 2019-04-02 08:48:31 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-02 08:48:31 +0100 |
commit | 704da08fdc6bae6fdd6bf1b892ebe12afeef5eca (patch) | |
tree | e0613ab3ba0d4336b0912bbad8862f503ec180f6 /routers/user | |
parent | ef2a343e27d8af2de0bb696bd60d9a019e1e8b69 (diff) | |
download | gitea-704da08fdc6bae6fdd6bf1b892ebe12afeef5eca.tar.gz gitea-704da08fdc6bae6fdd6bf1b892ebe12afeef5eca.zip |
Better logging (#6038) (#6095)
* Panic don't fatal on create new logger
Fixes #5854
Signed-off-by: Andrew Thornton <art27@cantab.net>
* partial broken
* Update the logging infrastrcture
Signed-off-by: Andrew Thornton <art27@cantab.net>
* Reset the skip levels for Fatal and Error
Signed-off-by: Andrew Thornton <art27@cantab.net>
* broken ncsa
* More log.Error fixes
Signed-off-by: Andrew Thornton <art27@cantab.net>
* Remove nal
* set log-levels to lowercase
* Make console_test test all levels
* switch to lowercased levels
* OK now working
* Fix vetting issues
* Fix lint
* Fix tests
* change default logging to match current gitea
* Improve log testing
Signed-off-by: Andrew Thornton <art27@cantab.net>
* reset error skip levels to 0
* Update documentation and access logger configuration
* Redirect the router log back to gitea if redirect macaron log but also allow setting the log level - i.e. TRACE
* Fix broken level caching
* Refactor the router log
* Add Router logger
* Add colorizing options
* Adjust router colors
* Only create logger if they will be used
* update app.ini.sample
* rename Attribute ColorAttribute
* Change from white to green for function
* Set fatal/error levels
* Restore initial trace logger
* Fix Trace arguments in modules/auth/auth.go
* Properly handle XORMLogger
* Improve admin/config page
* fix fmt
* Add auto-compression of old logs
* Update error log levels
* Remove the unnecessary skip argument from Error, Fatal and Critical
* Add stacktrace support
* Fix tests
* Remove x/sync from vendors?
* Add stderr option to console logger
* Use filepath.ToSlash to protect against Windows in tests
* Remove prefixed underscores from names in colors.go
* Remove not implemented database logger
This was removed from Gogs on 4 Mar 2016 but left in the configuration
since then.
* Ensure that log paths are relative to ROOT_PATH
* use path.Join
* rename jsonConfig to logConfig
* Rename "config" to "jsonConfig" to make it clearer
* Requested changes
* Requested changes: XormLogger
* Try to color the windows terminal
If successful default to colorizing the console logs
* fixup
* Colorize initially too
* update vendor
* Colorize logs on default and remove if this is not a colorizing logger
* Fix documentation
* fix test
* Use go-isatty to detect if on windows we are on msys or cygwin
* Fix spelling mistake
* Add missing vendors
* More changes
* Rationalise the ANSI writer protection
* Adjust colors on advice from @0x5c
* Make Flags a comma separated list
* Move to use the windows constant for ENABLE_VIRTUAL_TERMINAL_PROCESSING
* Ensure matching is done on the non-colored message - to simpify EXPRESSION
Diffstat (limited to 'routers/user')
-rw-r--r-- | routers/user/auth.go | 12 | ||||
-rw-r--r-- | routers/user/auth_openid.go | 12 | ||||
-rw-r--r-- | routers/user/setting/account.go | 2 | ||||
-rw-r--r-- | routers/user/setting/profile.go | 2 |
4 files changed, 14 insertions, 14 deletions
diff --git a/routers/user/auth.go b/routers/user/auth.go index 0a24702c17..7e8ac94e4b 100644 --- a/routers/user/auth.go +++ b/routers/user/auth.go @@ -408,7 +408,7 @@ func U2FSign(ctx *context.Context, signResp u2f.SignResponse) { for _, reg := range regs { r, err := reg.Parse() if err != nil { - log.Fatal(4, "parsing u2f registration: %v", err) + log.Fatal("parsing u2f registration: %v", err) continue } newCounter, authErr := r.Authenticate(signResp, *challenge, reg.Counter) @@ -478,7 +478,7 @@ func handleSignInFull(ctx *context.Context, u *models.User, remember bool, obeyR if len(u.Language) == 0 { u.Language = ctx.Locale.Language() if err := models.UpdateUserCols(u, "language"); err != nil { - log.Error(4, fmt.Sprintf("Error updating user language [user: %d, locale: %s]", u.ID, u.Language)) + log.Error(fmt.Sprintf("Error updating user language [user: %d, locale: %s]", u.ID, u.Language)) return setting.AppSubURL + "/" } } @@ -885,7 +885,7 @@ func LinkAccountPostRegister(ctx *context.Context, cpt *captcha.Captcha, form au ctx.HTML(200, TplActivate) if err := ctx.Cache.Put("MailResendLimit_"+u.LowerName, u.LowerName, 180); err != nil { - log.Error(4, "Set cache(MailResendLimit) fail: %v", err) + log.Error("Set cache(MailResendLimit) fail: %v", err) } return } @@ -1023,7 +1023,7 @@ func SignUpPost(ctx *context.Context, cpt *captcha.Captcha, form auth.RegisterFo ctx.HTML(200, TplActivate) if err := ctx.Cache.Put("MailResendLimit_"+u.LowerName, u.LowerName, 180); err != nil { - log.Error(4, "Set cache(MailResendLimit) fail: %v", err) + log.Error("Set cache(MailResendLimit) fail: %v", err) } return } @@ -1050,7 +1050,7 @@ func Activate(ctx *context.Context) { models.SendActivateAccountMail(ctx.Context, ctx.User) if err := ctx.Cache.Put("MailResendLimit_"+ctx.User.LowerName, ctx.User.LowerName, 180); err != nil { - log.Error(4, "Set cache(MailResendLimit) fail: %v", err) + log.Error("Set cache(MailResendLimit) fail: %v", err) } } } else { @@ -1166,7 +1166,7 @@ func ForgotPasswdPost(ctx *context.Context) { models.SendResetPasswordMail(ctx.Context, u) if err = ctx.Cache.Put("MailResendLimit_"+u.LowerName, u.LowerName, 180); err != nil { - log.Error(4, "Set cache(MailResendLimit) fail: %v", err) + log.Error("Set cache(MailResendLimit) fail: %v", err) } ctx.Data["ResetPwdCodeLives"] = base.MinutesToFriendly(setting.Service.ResetPwdCodeLives, ctx.Locale.Language()) diff --git a/routers/user/auth_openid.go b/routers/user/auth_openid.go index 8a8a5b7306..5ab9909270 100644 --- a/routers/user/auth_openid.go +++ b/routers/user/auth_openid.go @@ -115,7 +115,7 @@ func SignInOpenIDPost(ctx *context.Context, form auth.SignInOpenIDForm) { redirectTo := setting.AppURL + "user/login/openid" url, err := openid.RedirectURL(id, redirectTo, setting.AppURL) if err != nil { - log.Error(1, "Error in OpenID redirect URL: %s, %v", redirectTo, err.Error()) + log.Error("Error in OpenID redirect URL: %s, %v", redirectTo, err.Error()) ctx.RenderWithErr(fmt.Sprintf("Unable to find OpenID provider in %s", redirectTo), tplSignInOpenID, &form) return } @@ -125,7 +125,7 @@ func SignInOpenIDPost(ctx *context.Context, form auth.SignInOpenIDForm) { url += "&openid.ns.sreg=http%3A%2F%2Fopenid.net%2Fextensions%2Fsreg%2F1.1" url += "&openid.sreg.optional=nickname%2Cemail" - log.Trace("Form-passed openid-remember: %s", form.Remember) + log.Trace("Form-passed openid-remember: %t", form.Remember) ctx.Session.Set("openid_signin_remember", form.Remember) ctx.Redirect(url) @@ -164,7 +164,7 @@ func signInOpenIDVerify(ctx *context.Context) { if u != nil { log.Trace("User exists, logging in") remember, _ := ctx.Session.Get("openid_signin_remember").(bool) - log.Trace("Session stored openid-remember: %s", remember) + log.Trace("Session stored openid-remember: %t", remember) handleSignIn(ctx, u, remember) return } @@ -294,7 +294,7 @@ func ConnectOpenIDPost(ctx *context.Context, form auth.ConnectOpenIDForm) { ctx.Flash.Success(ctx.Tr("settings.add_openid_success")) remember, _ := ctx.Session.Get("openid_signin_remember").(bool) - log.Trace("Session stored openid-remember: %s", remember) + log.Trace("Session stored openid-remember: %t", remember) handleSignIn(ctx, u, remember) } @@ -426,12 +426,12 @@ func RegisterOpenIDPost(ctx *context.Context, cpt *captcha.Captcha, form auth.Si ctx.HTML(200, TplActivate) if err := ctx.Cache.Put("MailResendLimit_"+u.LowerName, u.LowerName, 180); err != nil { - log.Error(4, "Set cache(MailResendLimit) fail: %v", err) + log.Error("Set cache(MailResendLimit) fail: %v", err) } return } remember, _ := ctx.Session.Get("openid_signin_remember").(bool) - log.Trace("Session stored openid-remember: %s", remember) + log.Trace("Session stored openid-remember: %t", remember) handleSignIn(ctx, u, remember) } diff --git a/routers/user/setting/account.go b/routers/user/setting/account.go index ff8631bf5b..3fd6a8db5e 100644 --- a/routers/user/setting/account.go +++ b/routers/user/setting/account.go @@ -110,7 +110,7 @@ func EmailPost(ctx *context.Context, form auth.AddEmailForm) { models.SendActivateEmailMail(ctx.Context, ctx.User, email) if err := ctx.Cache.Put("MailResendLimit_"+ctx.User.LowerName, ctx.User.LowerName, 180); err != nil { - log.Error(4, "Set cache(MailResendLimit) fail: %v", err) + log.Error("Set cache(MailResendLimit) fail: %v", err) } ctx.Flash.Info(ctx.Tr("settings.add_email_confirmation_sent", email.Email, base.MinutesToFriendly(setting.Service.ActiveCodeLives, ctx.Locale.Language()))) } else { diff --git a/routers/user/setting/profile.go b/routers/user/setting/profile.go index 96210b79f8..85c9c83fd1 100644 --- a/routers/user/setting/profile.go +++ b/routers/user/setting/profile.go @@ -142,7 +142,7 @@ func UpdateAvatarSetting(ctx *context.Context, form auth.AvatarForm, ctxUser *mo // generate a random one when needed. if ctxUser.UseCustomAvatar && !com.IsFile(ctxUser.CustomAvatarPath()) { if err := ctxUser.GenerateRandomAvatar(); err != nil { - log.Error(4, "GenerateRandomAvatar[%d]: %v", ctxUser.ID, err) + log.Error("GenerateRandomAvatar[%d]: %v", ctxUser.ID, err) } } } |