From 3d0c56fe2e8e2476a6e4516dd8e619ff07f6a3d3 Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" Date: Tue, 10 Aug 2021 13:22:04 +0200 Subject: [PATCH] Don't print stack on CLI parsing failure or --help refs #334 --- internal/command/command.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/internal/command/command.go b/internal/command/command.go index d7a8ef7c..1450b445 100644 --- a/internal/command/command.go +++ b/internal/command/command.go @@ -7,6 +7,7 @@ import ( "github.com/icinga/icingadb/pkg/icingadb" "github.com/icinga/icingadb/pkg/icingaredis" "github.com/icinga/icingadb/pkg/utils" + goflags "github.com/jessevdk/go-flags" "github.com/pkg/errors" "go.uber.org/zap" "os" @@ -23,7 +24,12 @@ type Command struct { func New() *Command { flags, err := config.ParseFlags() if err != nil { - utils.Fatal(err) + var cliErr *goflags.Error + if errors.As(err, &cliErr) && cliErr.Type == goflags.ErrHelp { + os.Exit(0) + } + + os.Exit(2) } if flags.Version {