hoelee/cloudflared
1
0
Fork 0
mirror of https://github.com/cloudflare/cloudflared.git synced 2025-07-28 11:29:57 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

TUN-3524: Don't ignore errors from app-level action handler (#248)

Browse Source
This commit is contained in:
Igor Postelnik
2020-11-09 16:53:51 -06:00
parent 64d3836645
commit 8c6181db9f
2 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cmd/cloudflared/cliutil/errors.go
View File

@@ -27,17 +27,17 @@ func UsageError(format string, args ...interface{}) error {
// Ensures exit with error code if actionFunc returns an error
func ErrorHandler(actionFunc cli.ActionFunc) cli.ActionFunc {
return func(ctx *cli.Context) error {
defer logger.SharedWriteManager.Shutdown()
err := actionFunc(ctx)
if err != nil {
if _, ok := err.(usageError); ok {
msg := fmt.Sprintf("%s\nSee 'cloudflared %s --help'.", err.Error(), ctx.Command.FullName())
return cli.Exit(msg, -1)
err = cli.Exit(msg, -1)
} else if _, ok := err.(cli.ExitCoder); !ok {
err = cli.Exit(err.Error(), 1)
}
// os.Exits with error code if err is cli.ExitCoder or cli.MultiError
cli.HandleExitCoder(err)
err = cli.Exit(err.Error(), 1)
}
logger.SharedWriteManager.Shutdown()
return err
}
}