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 sub-command log level #25537

Merged
merged 2 commits into from
Jun 28, 2023
Merged

Conversation

wxiaoguang
Copy link
Contributor

@wxiaoguang wxiaoguang commented Jun 27, 2023

More fix for #24981

Close #22361

There were many patches for Gitea's sub-commands to satisfy the facts:

  • Some sub-commands shouldn't output any log, otherwise the git protocol would be broken
  • Sometimes the users want to see "verbose" or "quiet" outputs

That's a longstanding problem, and very fragile. This PR is only a quick patch for the problem.

In the future, the sub-command system should be refactored to a clear solution.


Other changes:

  • Use ReplaceAllWriters to replace RemoveAllWriters().AddWriters(writer), then it's an atomic operation.
  • Remove unnecessary syncLevelInternal calls, because AddWriters/addWritersInternal already calls it.

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jun 27, 2023
@pull-request-size pull-request-size bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jun 27, 2023
@wxiaoguang wxiaoguang added this to the 1.21.0 milestone Jun 27, 2023
@wxiaoguang wxiaoguang added the backport/v1.20 This PR should be backported to Gitea 1.20 label Jun 27, 2023
@wxiaoguang wxiaoguang changed the title fix Fix sub-command log level Jun 27, 2023
@wxiaoguang wxiaoguang marked this pull request as draft June 27, 2023 15:50
@wxiaoguang wxiaoguang added the pr/wip This PR is not ready for review label Jun 27, 2023
@wxiaoguang wxiaoguang removed the pr/wip This PR is not ready for review label Jun 27, 2023
@wxiaoguang wxiaoguang marked this pull request as ready for review June 27, 2023 16:05
@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Jun 27, 2023
@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 Jun 28, 2023
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jun 28, 2023
@silverwind silverwind merged commit 65d3e11 into go-gitea:main Jun 28, 2023
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jun 28, 2023
@wxiaoguang wxiaoguang deleted the fix-cmd-log-level branch June 28, 2023 06:04
@wxiaoguang wxiaoguang mentioned this pull request Jun 28, 2023
wxiaoguang added a commit to wxiaoguang/gitea that referenced this pull request Jun 28, 2023
More fix for go-gitea#24981

* go-gitea#24981


Close go-gitea#22361

* go-gitea#22361

There were many patches for Gitea's sub-commands to satisfy the facts:

* Some sub-commands shouldn't output any log, otherwise the git protocol
would be broken
* Sometimes the users want to see "verbose" or "quiet" outputs

That's a longstanding problem, and very fragile. This PR is only a quick
patch for the problem.

In the future, the sub-command system should be refactored to a clear
solution.

----

Other changes:

* Use `ReplaceAllWriters` to replace
`RemoveAllWriters().AddWriters(writer)`, then it's an atomic operation.
* Remove unnecessary `syncLevelInternal` calls, because
`AddWriters/addWritersInternal` already calls it.

Co-authored-by: Giteabot <teabot@gitea.io>
@wxiaoguang wxiaoguang added the backport/done All backports for this PR have been created label Jun 28, 2023
@wxiaoguang wxiaoguang added the backport/manual No power to the bots! Create your backport yourself! label Jun 28, 2023
lunny pushed a commit that referenced this pull request Jun 28, 2023
Backport #25537

More fix for #24981

* #24981

Close #22361, #25552

* #22361
* #25552

There were many patches for Gitea's sub-commands to satisfy the facts:

* Some sub-commands shouldn't output any log, otherwise the git protocol
would be broken
* Sometimes the users want to see "verbose" or "quiet" outputs

That's a longstanding problem, and very fragile. This PR is only a quick
patch for the problem.

In the future, the sub-command system should be refactored to a clear
solution.

----

Other changes:

* Use `ReplaceAllWriters` to replace
`RemoveAllWriters().AddWriters(writer)`, then it's an atomic operation.
* Remove unnecessary `syncLevelInternal` calls, because
`AddWriters/addWritersInternal` already calls it.
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Sep 26, 2023
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 backport/manual No power to the bots! Create your backport yourself! backport/v1.20 This PR should be backported to Gitea 1.20 lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

--quiet is not usable as a global option with gitea web
5 participants