Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix incorrect error logging in Stats indexer and OAuth2 #12387

Merged

Conversation

zeripath
Copy link
Contributor

Fixes two cases of bad logging:

  • Handle ErrAlreadyInQueue in stats indexer
  • Fix incorrect logging in oauth2.go

Fix #12380
Fix #11945

Signed-off-by: Andrew Thornton art27@cantab.net

Fix go-gitea#11945

Signed-off-by: Andrew Thornton <art27@cantab.net>
Fix go-gitea#12380

Signed-off-by: Andrew Thornton <art27@cantab.net>
@zeripath zeripath added this to the 1.13.0 milestone Jul 31, 2020
@zeripath zeripath changed the title Fix incorrect logging in Stats indexer and OAuth2 Fix incorrect error logging in Stats indexer and OAuth2 Jul 31, 2020
@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Jul 31, 2020
Add the missing character in the error message.
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Aug 1, 2020
@techknowlogick techknowlogick merged commit bac65f1 into go-gitea:master Aug 1, 2020
@zeripath zeripath deleted the fix-11945-12380-bad-logging branch August 1, 2020 17:41
@lafriks
Copy link
Member

lafriks commented Aug 3, 2020

Please send backport

techknowlogick added a commit to techknowlogick/gitea that referenced this pull request Aug 4, 2020
* Fix incorrect logging in oauth2.go

Fix go-gitea#11945

Signed-off-by: Andrew Thornton <art27@cantab.net>

* Handle ErrAlreadyInQueue in stats indexer

Fix go-gitea#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>
@techknowlogick techknowlogick added the backport/done All backports for this PR have been created label Aug 4, 2020
@techknowlogick
Copy link
Member

I've just sent the backport in #12387

lunny pushed a commit that referenced this pull request Aug 4, 2020
)

* 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>
@go-gitea go-gitea locked and limited conversation to collaborators Nov 24, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
backport/done All backports for this PR have been created lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

UpdateRepoIndexer(51) failed: already in queue error GetAccessTokenBySHA access token does not exist
6 participants