From 4089b5e4c27e0ab34c84250d41df3675d08f7a99 Mon Sep 17 00:00:00 2001
From: Carlos Salguero <carlos.salguero@percona.com>
Date: Thu, 23 Feb 2017 11:14:45 -0300
Subject: [PATCH] PT-73 Fixed help flag

---
 src/go/pt-mongodb-query-digest/main.go |  6 +++---
 src/go/pt-mongodb-summary/main.go      | 12 ++++++++++--
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/go/pt-mongodb-query-digest/main.go b/src/go/pt-mongodb-query-digest/main.go
index 07876adc..b808300d 100644
--- a/src/go/pt-mongodb-query-digest/main.go
+++ b/src/go/pt-mongodb-query-digest/main.go
@@ -155,8 +155,7 @@ func main() {
 		log.Errorf("error processing commad line arguments: %s", err)
 		os.Exit(1)
 	}
-	if opts.Help {
-		getopt.Usage()
+	if opts == nil && err == nil {
 		return
 	}
 
@@ -540,7 +539,8 @@ func getOptions() (*options, error) {
 		gop.Parse(gop.Args())
 	}
 	if opts.Help {
-		return opts, nil
+		gop.PrintUsage(os.Stdout)
+		return nil, nil
 	}
 
 	if gop.IsSet("order-by") {
diff --git a/src/go/pt-mongodb-summary/main.go b/src/go/pt-mongodb-summary/main.go
index 272241cf..dd63a88e 100644
--- a/src/go/pt-mongodb-summary/main.go
+++ b/src/go/pt-mongodb-summary/main.go
@@ -143,6 +143,9 @@ func main() {
 		log.Errorf("cannot get parameters: %s", err.Error())
 		os.Exit(2)
 	}
+	if opts == nil && err == nil {
+		return
+	}
 
 	if opts.Help {
 		getopt.Usage()
@@ -784,8 +787,8 @@ func externalIP() (string, error) {
 	return "", errors.New("are you connected to the network?")
 }
 
-func parseFlags() (options, error) {
-	opts := options{
+func parseFlags() (*options, error) {
+	opts := &options{
 		Host:               DEFAULT_HOST,
 		LogLevel:           DEFAULT_LOGLEVEL,
 		RunningOpsSamples:  DEFAULT_RUNNINGOPSSAMPLES,
@@ -828,6 +831,11 @@ func parseFlags() (options, error) {
 		}
 		opts.Password = string(pass)
 	}
+	if opts.Help {
+		gop.PrintUsage(os.Stdout)
+		return nil, nil
+	}
+
 	return opts, nil
 }