From eabeb89e2609ec420e0e4953a6e03ba77ab952c1 Mon Sep 17 00:00:00 2001 From: Waldemar Quevedo Date: Thu, 16 May 2019 22:38:46 -0700 Subject: [PATCH] Fixes to example tools Signed-off-by: Waldemar Quevedo --- examples/nats-bench/main.go | 13 +++++++++++-- examples/nats-echo/main.go | 12 +++++++++++- examples/nats-pub/main.go | 14 ++++++++++++-- examples/nats-qsub/main.go | 12 +++++++++++- examples/nats-req/main.go | 13 ++++++++++++- examples/nats-rply/main.go | 13 ++++++++++++- examples/nats-sub/main.go | 13 ++++++++++++- 7 files changed, 81 insertions(+), 9 deletions(-) diff --git a/examples/nats-bench/main.go b/examples/nats-bench/main.go index bbcfaa103..be1583dfe 100644 --- a/examples/nats-bench/main.go +++ b/examples/nats-bench/main.go @@ -37,7 +37,11 @@ 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] \n", nats.DefaultURL) flag.PrintDefaults() - os.Exit(1) +} + +func showUsageAndExit(exitcode int) { + usage() + os.Exit(exitcode) } var benchmark *bench.Benchmark @@ -51,14 +55,19 @@ 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 { + showUsageAndExit(0) + } + args := flag.Args() if len(args) != 1 { - usage() + showUsageAndExit(1) } if *numMsgs <= 0 { diff --git a/examples/nats-echo/main.go b/examples/nats-echo/main.go index d7c867ba5..9d143e91a 100644 --- a/examples/nats-echo/main.go +++ b/examples/nats-echo/main.go @@ -38,6 +38,11 @@ func usage() { flag.PrintDefaults() } +func showUsageAndExit(exitcode int) { + usage() + os.Exit(exitcode) +} + func printMsg(m *nats.Msg, i int) { log.Printf("[#%d] Echoing to [%s]: %q", i, m.Reply, m.Data) } @@ -46,6 +51,7 @@ 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 @@ -53,9 +59,13 @@ func main() { flag.Usage = usage flag.Parse() + if *showHelp { + showUsageAndExit(0) + } + args := flag.Args() if len(args) != 1 { - usage() + showUsageAndExit(1) } // Lookup geo if requested diff --git a/examples/nats-pub/main.go b/examples/nats-pub/main.go index 1244edaaa..934bc1dff 100644 --- a/examples/nats-pub/main.go +++ b/examples/nats-pub/main.go @@ -16,6 +16,7 @@ package main import ( "flag" "log" + "os" "github.com/nats-io/nats.go" ) @@ -29,17 +30,27 @@ func usage() { flag.PrintDefaults() } +func showUsageAndExit(exitcode int) { + usage() + os.Exit(exitcode) +} + 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 { + showUsageAndExit(0) + } + args := flag.Args() if len(args) != 2 { - usage() + showUsageAndExit(1) } // Connect Options. @@ -56,7 +67,6 @@ func main() { log.Fatal(err) } defer nc.Close() - subj, msg := args[0], []byte(args[1]) nc.Publish(subj, msg) diff --git a/examples/nats-qsub/main.go b/examples/nats-qsub/main.go index fa03df1e4..b8c4092cb 100644 --- a/examples/nats-qsub/main.go +++ b/examples/nats-qsub/main.go @@ -32,6 +32,11 @@ func usage() { flag.PrintDefaults() } +func showUsageAndExit(exitcode int) { + usage() + os.Exit(exitcode) +} + 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,19 @@ 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 { + showUsageAndExit(0) + } + args := flag.Args() if len(args) != 2 { - usage() + showUsageAndExit(1) } // Connect Options. diff --git a/examples/nats-req/main.go b/examples/nats-req/main.go index b7ddc3d24..a3f2ef396 100644 --- a/examples/nats-req/main.go +++ b/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,27 @@ func usage() { flag.PrintDefaults() } +func showUsageAndExit(exitcode int) { + usage() + os.Exit(exitcode) +} + 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 { + showUsageAndExit(0) + } + args := flag.Args() if len(args) < 2 { - usage() + showUsageAndExit(1) } // Connect Options. diff --git a/examples/nats-rply/main.go b/examples/nats-rply/main.go index 49fc7a515..cea34e003 100644 --- a/examples/nats-rply/main.go +++ b/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 showUsageAndExit(exitcode int) { + usage() + os.Exit(exitcode) +} + func printMsg(m *nats.Msg, i int) { log.Printf("[#%d] Received on [%s]: '%s'\n", i, m.Subject, string(m.Data)) } @@ -39,14 +45,19 @@ 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 { + showUsageAndExit(0) + } + args := flag.Args() if len(args) < 2 { - usage() + showUsageAndExit(1) } // Connect Options. diff --git a/examples/nats-sub/main.go b/examples/nats-sub/main.go index cb5023134..ea1e352d7 100644 --- a/examples/nats-sub/main.go +++ b/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 showUsageAndExit(exitcode int) { + usage() + os.Exit(exitcode) +} + func printMsg(m *nats.Msg, i int) { log.Printf("[#%d] Received on [%s]: '%s'", i, m.Subject, string(m.Data)) } @@ -39,14 +45,19 @@ 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 { + showUsageAndExit(0) + } + args := flag.Args() if len(args) != 1 { - usage() + showUsageAndExit(1) } // Connect Options.