diff options
author | wxiaoguang <wxiaoguang@gmail.com> | 2023-06-28 14:02:06 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-06-28 08:02:06 +0200 |
commit | 65d3e1161b0544f50d94dbbecb6bcf135535e112 (patch) | |
tree | 2f1a9a0630e37c9db17b842122b425b46b501867 /main.go | |
parent | b943318617633e7dc43f3ac1c146be1e37563093 (diff) | |
download | gitea-65d3e1161b0544f50d94dbbecb6bcf135535e112.tar.gz gitea-65d3e1161b0544f50d94dbbecb6bcf135535e112.zip |
Fix sub-command log level (#25537)
More fix for #24981
* #24981
Close #22361
* #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>
Diffstat (limited to 'main.go')
-rw-r--r-- | main.go | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -108,7 +108,9 @@ func main() { cmd.CmdActions, } - // default configuration flags + // shared configuration flags, they are for global and for each sub-command at the same time + // eg: such command is valid: "./gitea --config /tmp/app.ini web --config /tmp/app.ini", while it's discouraged indeed + // keep in mind that the short flags like "-C", "-c" and "-w" are globally polluted, they can't be used for sub-commands anymore. globalFlags := []cli.Flag{ cli.HelpFlag, cli.StringFlag{ @@ -128,9 +130,10 @@ func main() { // Set the default to be equivalent to cmdWeb and add the default flags app.Flags = append(app.Flags, globalFlags...) - app.Flags = append(app.Flags, cmd.CmdWeb.Flags...) + app.Flags = append(app.Flags, cmd.CmdWeb.Flags...) // TODO: the web flags polluted the global flags, they are not really global flags app.Action = prepareWorkPathAndCustomConf(cmd.CmdWeb.Action) app.HideHelp = true // use our own help action to show helps (with more information like default config) + app.Before = cmd.PrepareConsoleLoggerLevel(log.INFO) app.Commands = append(app.Commands, cmdHelp) for i := range app.Commands { prepareSubcommands(&app.Commands[i], globalFlags) |