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 /modules/auth/auth.go | |
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 'modules/auth/auth.go')
-rw-r--r-- | modules/auth/auth.go | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/modules/auth/auth.go b/modules/auth/auth.go index 4be358b737..c9e5c44da5 100644 --- a/modules/auth/auth.go +++ b/modules/auth/auth.go @@ -63,13 +63,13 @@ func SignedInID(ctx *macaron.Context, sess session.Store) int64 { t, err := models.GetAccessTokenBySHA(tokenSHA) if err != nil { if models.IsErrAccessTokenNotExist(err) || models.IsErrAccessTokenEmpty(err) { - log.Error(4, "GetAccessTokenBySHA: %v", err) + log.Error("GetAccessTokenBySHA: %v", err) } return 0 } t.UpdatedUnix = util.TimeStampNow() if err = models.UpdateAccessToken(t); err != nil { - log.Error(4, "UpdateAccessToken: %v", err) + log.Error("UpdateAccessToken: %v", err) } ctx.Data["IsApiToken"] = true return t.UID @@ -92,7 +92,7 @@ func checkOAuthAccessToken(accessToken string) int64 { } token, err := models.ParseOAuth2Token(accessToken) if err != nil { - log.Trace("ParseOAuth2Token", err) + log.Trace("ParseOAuth2Token: %v", err) return 0 } var grant *models.OAuth2Grant @@ -120,7 +120,7 @@ func SignedInUser(ctx *macaron.Context, sess session.Store) (*models.User, bool) if err == nil { return user, false } else if !models.IsErrUserNotExist(err) { - log.Error(4, "GetUserById: %v", err) + log.Error("GetUserById: %v", err) } } @@ -130,7 +130,7 @@ func SignedInUser(ctx *macaron.Context, sess session.Store) (*models.User, bool) u, err := models.GetUserByName(webAuthUser) if err != nil { if !models.IsErrUserNotExist(err) { - log.Error(4, "GetUserByName: %v", err) + log.Error("GetUserByName: %v", err) return nil, false } @@ -151,7 +151,7 @@ func SignedInUser(ctx *macaron.Context, sess session.Store) (*models.User, bool) } if err = models.CreateUser(u); err != nil { // FIXME: should I create a system notice? - log.Error(4, "CreateUser: %v", err) + log.Error("CreateUser: %v", err) return nil, false } return u, false @@ -183,13 +183,13 @@ func SignedInUser(ctx *macaron.Context, sess session.Store) (*models.User, bool) if isUsernameToken { u, err = models.GetUserByID(token.UID) if err != nil { - log.Error(4, "GetUserByID: %v", err) + log.Error("GetUserByID: %v", err) return nil, false } } else { u, err = models.GetUserByName(uname) if err != nil { - log.Error(4, "GetUserByID: %v", err) + log.Error("GetUserByID: %v", err) return nil, false } if u.ID != token.UID { @@ -198,11 +198,11 @@ func SignedInUser(ctx *macaron.Context, sess session.Store) (*models.User, bool) } token.UpdatedUnix = util.TimeStampNow() if err = models.UpdateAccessToken(token); err != nil { - log.Error(4, "UpdateAccessToken: %v", err) + log.Error("UpdateAccessToken: %v", err) } } else { if !models.IsErrAccessTokenNotExist(err) && !models.IsErrAccessTokenEmpty(err) { - log.Error(4, "GetAccessTokenBySha: %v", err) + log.Error("GetAccessTokenBySha: %v", err) } } @@ -210,7 +210,7 @@ func SignedInUser(ctx *macaron.Context, sess session.Store) (*models.User, bool) u, err = models.UserSignIn(uname, passwd) if err != nil { if !models.IsErrUserNotExist(err) { - log.Error(4, "UserSignIn: %v", err) + log.Error("UserSignIn: %v", err) } return nil, false } |