diff options
| author | techknowlogick <techknowlogick@gitea.io> | 2020-08-04 04:27:43 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-04 16:27:43 +0800 |
| commit | 6015d30dd615c70234cd4a4a9f6775966bf84b3a (patch) | |
| tree | e5beb3fc261e750005374e30c27446c4284cc573 | |
| parent | b1cfb0d7a2cc65c42152b7ad8019819b6502dd36 (diff) | |
| download | gitea-6015d30dd615c70234cd4a4a9f6775966bf84b3a.tar.gz gitea-6015d30dd615c70234cd4a4a9f6775966bf84b3a.zip | |
Fix incorrect error logging in Stats indexer and OAuth2 (#12387) (#12422)
* Fix incorrect logging in oauth2.go
Fix #11945
Signed-off-by: Andrew Thornton <art27@cantab.net>
* Handle ErrAlreadyInQueue in stats indexer
Fix #12380
Signed-off-by: Andrew Thornton <art27@cantab.net>
* Fixes type in error message of indexer
Add the missing character in the error message.
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
Co-authored-by: Lieven Hollevoet <hollie@lika.be>
Co-authored-by: zeripath <art27@cantab.net>
Co-authored-by: Lieven Hollevoet <hollie@lika.be>
| -rw-r--r-- | modules/auth/sso/oauth2.go | 2 | ||||
| -rw-r--r-- | modules/indexer/stats/queue.go | 10 |
2 files changed, 9 insertions, 3 deletions
diff --git a/modules/auth/sso/oauth2.go b/modules/auth/sso/oauth2.go index e677490b80..6860c12e39 100644 --- a/modules/auth/sso/oauth2.go +++ b/modules/auth/sso/oauth2.go @@ -93,7 +93,7 @@ func (o *OAuth2) userIDFromToken(ctx *macaron.Context) int64 { } t, err := models.GetAccessTokenBySHA(tokenSHA) if err != nil { - if models.IsErrAccessTokenNotExist(err) || models.IsErrAccessTokenEmpty(err) { + if !models.IsErrAccessTokenNotExist(err) && !models.IsErrAccessTokenEmpty(err) { log.Error("GetAccessTokenBySHA: %v", err) } return 0 diff --git a/modules/indexer/stats/queue.go b/modules/indexer/stats/queue.go index 9c83f9b412..8309cfcd3b 100644 --- a/modules/indexer/stats/queue.go +++ b/modules/indexer/stats/queue.go @@ -21,7 +21,7 @@ func handle(data ...queue.Data) { for _, datum := range data { opts := datum.(int64) if err := indexer.Index(opts); err != nil { - log.Error("stats queue idexer.Index(%d) failed: %v", opts, err) + log.Error("stats queue indexer.Index(%d) failed: %v", opts, err) } } } @@ -39,5 +39,11 @@ func initStatsQueue() error { // UpdateRepoIndexer update a repository's entries in the indexer func UpdateRepoIndexer(repo *models.Repository) error { - return statsQueue.Push(repo.ID) + if err := statsQueue.Push(repo.ID); err != nil { + if err != queue.ErrAlreadyInQueue { + return err + } + log.Debug("Repo ID: %d already queued", repo.ID) + } + return nil } |