bug: version should be processed before other flags (#99)

This commit is contained in:
Bobby DeSimone 2019-05-01 12:52:57 -07:00 committed by GitHub
parent 4bdb9173ff
commit 1a3add8fbc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -26,21 +26,21 @@ var (
)
func main() {
flag.Parse()
if *versionFlag {
fmt.Printf("%s\n", version.FullVersion())
os.Exit(0)
}
mainOpts, err := optionsFromEnvConfig()
if err != nil {
log.Fatal().Err(err).Msg("cmd/pomerium: settings error")
}
flag.Parse()
if *debugFlag || mainOpts.Debug {
log.SetDebugMode()
}
if mainOpts.LogLevel != "" {
log.SetLevel(mainOpts.LogLevel)
}
if *versionFlag {
fmt.Printf("%s", version.FullVersion())
os.Exit(0)
}
log.Info().Str("version", version.FullVersion()).Str("user-agent", version.UserAgent()).Str("service", mainOpts.Services).Msg("cmd/pomerium")
grpcAuth := middleware.NewSharedSecretCred(mainOpts.SharedKey)