Fixes to example tools

Signed-off-by: Waldemar Quevedo <[email protected]>

examples/nats-bench/main.go

@@ -37,6 +37,10 @@ const (
 func usage() {
 	log.Printf("Usage: nats-bench [-s server (%s)] [--tls] [-np NUM_PUBLISHERS] [-ns NUM_SUBSCRIBERS] [-n NUM_MSGS] [-ms MESSAGE_SIZE] [-csv csvfile] <subject>\n", nats.DefaultURL)
 	flag.PrintDefaults()
+}
+
+func showUsageAndDie() {
+	usage()
 	os.Exit(1)
 }
 
@@ -51,14 +55,20 @@ func main() {
 	var msgSize = flag.Int("ms", DefaultMessageSize, "Size of the message.")
 	var csvFile = flag.String("csv", "", "Save bench data to csv file")
 	var userCreds = flag.String("creds", "", "User Credentials File")
+	var showHelp = flag.Bool("h", false, "Show help message")
 
 	log.SetFlags(0)
 	flag.Usage = usage
 	flag.Parse()
 
+	if *showHelp {
+		usage()
+		os.Exit(0)
+	}
+
 	args := flag.Args()
 	if len(args) != 1 {
-		usage()
+		showUsageAndDie()
 	}
 
 	if *numMsgs <= 0 {

examples/nats-echo/main.go

@@ -38,6 +38,11 @@ func usage() {
 	flag.PrintDefaults()
 }
 
+func showUsageAndDie() {
+	usage()
+	os.Exit(1)
+}
+
 func printMsg(m *nats.Msg, i int) {
 	log.Printf("[#%d] Echoing to [%s]: %q", i, m.Reply, m.Data)
 }
@@ -46,16 +51,22 @@ func main() {
 	var urls = flag.String("s", nats.DefaultURL, "The nats server URLs (separated by comma)")
 	var userCreds = flag.String("creds", "", "User Credentials File")
 	var showTime = flag.Bool("t", false, "Display timestamps")
+	var showHelp = flag.Bool("h", false, "Show help message")
 	var geoloc = flag.Bool("geo", false, "Display geo location of echo service")
 	var geo string
 
 	log.SetFlags(0)
 	flag.Usage = usage
 	flag.Parse()
 
+	if *showHelp {
+		usage()
+		os.Exit(0)
+	}
+
 	args := flag.Args()
 	if len(args) != 1 {
-		usage()
+		showUsageAndDie()
 	}
 
 	// Lookup geo if requested

examples/nats-pub/main.go

@@ -16,6 +16,7 @@ package main
 import (
 	"flag"
 	"log"
+	"os"
 
 	"github.com/nats-io/nats.go"
 )
@@ -29,17 +30,28 @@ func usage() {
 	flag.PrintDefaults()
 }
 
+func showUsageAndDie() {
+	usage()
+	os.Exit(1)
+}
+
 func main() {
 	var urls = flag.String("s", nats.DefaultURL, "The nats server URLs (separated by comma)")
 	var userCreds = flag.String("creds", "", "User Credentials File")
+	var showHelp = flag.Bool("h", false, "Show help message")
 
 	log.SetFlags(0)
 	flag.Usage = usage
 	flag.Parse()
 
+	if *showHelp {
+		usage()
+		os.Exit(0)
+	}
+
 	args := flag.Args()
 	if len(args) != 2 {
-		usage()
+		showUsageAndDie()
 	}
 
 	// Connect Options.
@@ -56,7 +68,6 @@ func main() {
 		log.Fatal(err)
 	}
 	defer nc.Close()
-
 	subj, msg := args[0], []byte(args[1])
 
 	nc.Publish(subj, msg)

examples/nats-qsub/main.go

@@ -32,6 +32,11 @@ func usage() {
 	flag.PrintDefaults()
 }
 
+func showUsageAndDie() {
+	usage()
+	os.Exit(1)
+}
+
 func printMsg(m *nats.Msg, i int) {
 	log.Printf("[#%d] Received on [%s] Queue[%s] Pid[%d]: '%s'", i, m.Subject, m.Sub.Queue, os.Getpid(), string(m.Data))
 }
@@ -40,14 +45,20 @@ func main() {
 	var urls = flag.String("s", nats.DefaultURL, "The nats server URLs (separated by comma)")
 	var userCreds = flag.String("creds", "", "User Credentials File")
 	var showTime = flag.Bool("t", false, "Display timestamps")
+	var showHelp = flag.Bool("h", false, "Show help message")
 
 	log.SetFlags(0)
 	flag.Usage = usage
 	flag.Parse()
 
+	if *showHelp {
+		usage()
+		os.Exit(0)
+	}
+
 	args := flag.Args()
 	if len(args) != 2 {
-		usage()
+		showUsageAndDie()
 	}
 
 	// Connect Options.

examples/nats-req/main.go

@@ -16,6 +16,7 @@ package main
 import (
 	"flag"
 	"log"
+	"os"
 	"time"
 
 	"github.com/nats-io/nats.go"
@@ -30,17 +31,28 @@ func usage() {
 	flag.PrintDefaults()
 }
 
+func showUsageAndDie() {
+	usage()
+	os.Exit(1)
+}
+
 func main() {
 	var urls = flag.String("s", nats.DefaultURL, "The nats server URLs (separated by comma)")
 	var userCreds = flag.String("creds", "", "User Credentials File")
+	var showHelp = flag.Bool("h", false, "Show help message")
 
 	log.SetFlags(0)
 	flag.Usage = usage
 	flag.Parse()
 
+	if *showHelp {
+		usage()
+		os.Exit(0)
+	}
+
 	args := flag.Args()
 	if len(args) < 2 {
-		usage()
+		showUsageAndDie()
 	}
 
 	// Connect Options.

examples/nats-rply/main.go

@@ -16,6 +16,7 @@ package main
 import (
 	"flag"
 	"log"
+	"os"
 	"runtime"
 	"time"
 
@@ -31,6 +32,11 @@ func usage() {
 	flag.PrintDefaults()
 }
 
+func showUsageAndDie() {
+	usage()
+	os.Exit(1)
+}
+
 func printMsg(m *nats.Msg, i int) {
 	log.Printf("[#%d] Received on [%s]: '%s'\n", i, m.Subject, string(m.Data))
 }
@@ -39,14 +45,20 @@ func main() {
 	var urls = flag.String("s", nats.DefaultURL, "The nats server URLs (separated by comma)")
 	var userCreds = flag.String("creds", "", "User Credentials File")
 	var showTime = flag.Bool("t", false, "Display timestamps")
+	var showHelp = flag.Bool("h", false, "Show help message")
 
 	log.SetFlags(0)
 	flag.Usage = usage
 	flag.Parse()
 
+	if *showHelp {
+		usage()
+		os.Exit(0)
+	}
+
 	args := flag.Args()
 	if len(args) < 2 {
-		usage()
+		showUsageAndDie()
 	}
 
 	// Connect Options.

examples/nats-sub/main.go

@@ -16,6 +16,7 @@ package main
 import (
 	"flag"
 	"log"
+	"os"
 	"runtime"
 	"time"
 
@@ -31,6 +32,11 @@ func usage() {
 	flag.PrintDefaults()
 }
 
+func showUsageAndDie() {
+	usage()
+	os.Exit(1)
+}
+
 func printMsg(m *nats.Msg, i int) {
 	log.Printf("[#%d] Received on [%s]: '%s'", i, m.Subject, string(m.Data))
 }
@@ -39,14 +45,20 @@ func main() {
 	var urls = flag.String("s", nats.DefaultURL, "The nats server URLs (separated by comma)")
 	var userCreds = flag.String("creds", "", "User Credentials File")
 	var showTime = flag.Bool("t", false, "Display timestamps")
+	var showHelp = flag.Bool("h", false, "Show help message")
 
 	log.SetFlags(0)
 	flag.Usage = usage
 	flag.Parse()
 
+	if *showHelp {
+		usage()
+		os.Exit(0)
+	}
+
 	args := flag.Args()
 	if len(args) != 1 {
-		usage()
+		showUsageAndDie()
 	}
 
 	// Connect Options.