domi/forgejo-domi
1
0
Fork 0
forked from forgejo/forgejo
Code Pull requests Activity

Fix incorrect CLI exit code and duplicate error message (#26346) (#26347)

Browse source 
Backport #26346

Follow the CLI refactoring, and add tests.

(cherry picked from commit fa431b377d)
This commit is contained in:
wxiaoguang 2023-08-05 23:37:04 +08:00 • committed by Earl Warren
parent 149cd865ea
commit 2e539d5190
No known key found for this signature in database
GPG key ID: 0579CB2928A78A00
4 changed files with 104 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
main.go
View file

@ -192,11 +192,11 @@ argument - which can alternatively be run by running the subcommand web.`
app.Commands = append(app.Commands, subCmdWithIni...)
app.Commands = append(app.Commands, subCmdStandalone...)
err := app.Run(os.Args)
if err != nil {
_, _ = fmt.Fprintf(app.Writer, "\nFailed to run with %s: %v\n", os.Args, err)
cli.OsExiter = func(code int) {
log.GetManager().Close()
os.Exit(code)
}
_ = cmd.RunMainApp(app, os.Args...) // all errors should have been handled by the RunMainApp
log.GetManager().Close()
}