From 8903cd9f2d5b1d96fa18f196784069afadbcc054 Mon Sep 17 00:00:00 2001 From: Jacob Hoffman-Andrews Date: Wed, 6 Apr 2022 11:10:40 -0700 Subject: [PATCH] akamai-purger: show help for `manual` subcommand (#6019) Fixes #5967 --- cmd/akamai-purger/main.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/cmd/akamai-purger/main.go b/cmd/akamai-purger/main.go index 2ca9855fc..a95df3ff4 100644 --- a/cmd/akamai-purger/main.go +++ b/cmd/akamai-purger/main.go @@ -228,7 +228,7 @@ func (ap *akamaiPurger) Purge(ctx context.Context, req *akamaipb.PurgeRequest) ( } func main() { - daemonFlags := flag.NewFlagSet("daemon", flag.ExitOnError) + daemonFlags := flag.NewFlagSet("daemon", flag.ContinueOnError) grpcAddr := daemonFlags.String("addr", "", "gRPC listen address override") debugAddr := daemonFlags.String("debug-addr", "", "Debug server address override") configFile := daemonFlags.String("config", "", "File path to the configuration file for this service") @@ -264,7 +264,11 @@ func main() { } configFile = manualConfigFile } else { - _ = daemonFlags.Parse(os.Args[1:]) + err := daemonFlags.Parse(os.Args[1:]) + if err != nil { + fmt.Fprintf(os.Stderr, "OR:\n%s manual -config conf.json [-tag Foo] [-tag-file]\n", os.Args[0]) + os.Exit(1) + } if *configFile == "" { daemonFlags.Usage() os.Exit(1)