From 1a3add8fbc080ba3ec3eb2f25cdfd5958735c8f4 Mon Sep 17 00:00:00 2001
From: Bobby DeSimone <desimone@users.noreply.github.com>
Date: Wed, 1 May 2019 12:52:57 -0700
Subject: [PATCH] bug: version should be processed before other flags (#99)

---
 cmd/pomerium/main.go | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/cmd/pomerium/main.go b/cmd/pomerium/main.go
index 201a3bc97..9fbfcf1ae 100644
--- a/cmd/pomerium/main.go
+++ b/cmd/pomerium/main.go
@@ -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)