Skip to content

Commit

Permalink
Exit properly after displayed help (#2589)
Browse files Browse the repository at this point in the history
* Fix exit after displayed help

Signed-off-by: tzzed <zerouali.t@gmail.com>

* Clean code.
Add review suggestion

Signed-off-by: tzzed <zerouali.t@gmail.com>
  • Loading branch information
tzzed authored Oct 26, 2020
1 parent 2bce5ad commit 884240d
Showing 1 changed file with 11 additions and 9 deletions.
20 changes: 11 additions & 9 deletions cmd/opentelemetry/cmd/all-in-one/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import (
"strings"

"github.com/opentracing/opentracing-go"
"github.com/spf13/pflag"
"github.com/spf13/viper"
jaegerClientConfig "github.com/uber/jaeger-client-go/config"
jaegerClientZapLog "github.com/uber/jaeger-client-go/log/zap"
Expand Down Expand Up @@ -59,9 +60,7 @@ func main() {
}
}

if err := app.RegisterMetricViews(); err != nil {
handleErr(err)
}
handleErr(app.RegisterMetricViews())

ver := version.Get()
info := component.ApplicationStartInfo{
Expand Down Expand Up @@ -94,9 +93,8 @@ func main() {
// Add Jaeger specific flags to service command
// this passes flag values to viper.
storageFlags, err := app.AddStorageFlags(storageType, true)
if err != nil {
handleErr(err)
}
handleErr(err)

cmd := svc.Command()
jConfig.AddFlags(v,
cmd,
Expand All @@ -106,15 +104,19 @@ func main() {
)

// parse flags to propagate Jaeger config file flag value to viper
cmd.ParseFlags(os.Args)
parseErr := cmd.ParseFlags(os.Args)
err = jflags.TryLoadConfigFile(v)
if err != nil {
handleErr(fmt.Errorf("could not load Jaeger configuration file %w", err))
}

go func() {
err = svc.Run()
handleErr(err)
handleErr(svc.Run())

if parseErr == pflag.ErrHelp {
os.Exit(0)
}

}()

for state := range svc.GetStateChannel() {
Expand Down

0 comments on commit 884240d

Please sign in to comment.