From 684a2e4173c2f8a657caa6c50d720515ef47696b Mon Sep 17 00:00:00 2001
From: Ivan Kozlovic <ivan.kozlovic@apcera.com>
Date: Thu, 7 Sep 2017 08:45:58 -0600
Subject: [PATCH] Update based on code review

---
 main.go        | 4 +---
 server/opts.go | 4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/main.go b/main.go
index d7c593b2..19a6ed02 100644
--- a/main.go
+++ b/main.go
@@ -65,9 +65,7 @@ func usage() {
 func main() {
 	// Create a FlagSet and sets the usage
 	fs := flag.NewFlagSet("nats-server", flag.ExitOnError)
-	fs.Usage = func() {
-		usage()
-	}
+	fs.Usage = usage
 
 	// Configure the options from the flags/config file
 	opts, err := server.ConfigureOptions(fs, os.Args[1:])
diff --git a/server/opts.go b/server/opts.go
index b1d9ee61..66af080d 100644
--- a/server/opts.go
+++ b/server/opts.go
@@ -1014,7 +1014,7 @@ func ConfigureOptions(fs *flag.FlagSet, args []string) (*Options, error) {
 
 	// Process signal control.
 	if signal != "" {
-		if err := processSignal(fs, signal); err != nil {
+		if err := processSignal(signal); err != nil {
 			return nil, err
 		}
 	}
@@ -1157,7 +1157,7 @@ func overrideCluster(opts *Options) error {
 	return nil
 }
 
-func processSignal(fs *flag.FlagSet, signal string) error {
+func processSignal(signal string) error {
 	var (
 		pid           string
 		commandAndPid = strings.Split(signal, "=")