Browse Source

Fix incorrect error logging in Stats indexer and OAuth2 (#12387)

* Fix incorrect logging in oauth2.go

Fix #11945

Signed-off-by: Andrew Thornton <[email protected]>

* Handle ErrAlreadyInQueue in stats indexer

Fix #12380

Signed-off-by: Andrew Thornton <[email protected]>

* Fixes type in error message of indexer

Add the missing character in the error message.

Co-authored-by: techknowlogick <[email protected]>
Co-authored-by: Lieven Hollevoet <[email protected]>
pull/12285/merge
zeripath GitHub 4 days ago
parent
commit
bac65f1b82
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 3 deletions
  1. +1
    -1
      modules/auth/sso/oauth2.go
  2. +8
    -2
      modules/indexer/stats/queue.go

+ 1
- 1
modules/auth/sso/oauth2.go View File

@@ -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


+ 8
- 2
modules/indexer/stats/queue.go View File

@@ -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
}

Loading…
Cancel
Save