From 830fb73e44aec91ec1a6fb1ebe7266e97dcb3913 Mon Sep 17 00:00:00 2001
From: Ivan Kozlovic <ivan.kozlovic@apcera.com>
Date: Tue, 3 May 2016 17:15:58 -0600
Subject: [PATCH] Remove usage.go and move its content into main.go

---
 main.go  | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++--
 usage.go | 56 --------------------------------------------------------
 2 files changed, 50 insertions(+), 58 deletions(-)
 delete mode 100644 usage.go

diff --git a/main.go b/main.go
index 71312db4..0d8f71d2 100644
--- a/main.go
+++ b/main.go
@@ -15,6 +15,54 @@ import (
 	"github.com/nats-io/gnatsd/server"
 )
 
+var usageStr = `
+Usage: gnatsd [options]
+
+Server Options:
+    -a, --addr <host>                Bind to host address (default: 0.0.0.0)
+    -p, --port <port>                Use port for clients (default: 4222)
+    -P, --pid <file>                 File to store PID
+    -m, --http_port <port>           Use port for http monitoring
+    -ms,--https_port <port>          Use port for https monitoring
+    -c, --config <file>              Configuration file
+
+Logging Options:
+    -l, --log <file>                 File to redirect log output
+    -T, --logtime                    Timestamp log entries (default: true)
+    -s, --syslog                     Enable syslog as log method
+    -r, --remote_syslog <addr>       Syslog server addr (udp://localhost:514)
+    -D, --debug                      Enable debugging output
+    -V, --trace                      Trace the raw protocol
+    -DV                              Debug and trace
+
+Authorization Options:
+        --user <user>                User required for connections
+        --pass <password>            Password required for connections
+        --auth <token>               Authorization token required for connections
+
+TLS Options:
+        --tls                        Enable TLS, do not verify clients (default: false)
+        --tlscert <file>             Server certificate file
+        --tlskey <file>              Private key for server certificate
+        --tlsverify                  Enable TLS, very client certificates
+        --tlscacert <file>           Client certificate CA for verification
+
+Cluster Options:
+        --routes <rurl-1, rurl-2>    Routes to solicit and connect
+        --cluster <cluster-url>      Cluster URL for solicited routes
+
+Common Options:
+    -h, --help                       Show this message
+    -v, --version                    Show version
+        --help_tls                   TLS help
+`
+
+// usage will print out the flag options for the server.
+func usage() {
+	fmt.Printf("%s\n", usageStr)
+	os.Exit(0)
+}
+
 func main() {
 	// Server Options
 	opts := server.Options{}
@@ -67,7 +115,7 @@ func main() {
 	flag.StringVar(&opts.TLSKey, "tlskey", "", "Private key for server certificate.")
 	flag.StringVar(&opts.TLSCaCert, "tlscacert", "", "Client certificate CA for verification.")
 
-	flag.Usage = Usage
+	flag.Usage = usage
 
 	flag.Parse()
 
@@ -92,7 +140,7 @@ func main() {
 		case "version":
 			server.PrintServerAndExit()
 		case "help":
-			Usage()
+			usage()
 		}
 	}
 
diff --git a/usage.go b/usage.go
deleted file mode 100644
index 12679779..00000000
--- a/usage.go
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright 2013-2016 Apcera Inc. All rights reserved.
-
-package main
-
-import (
-	"fmt"
-	"os"
-)
-
-var usageStr = `
-Usage: gnatsd [options]
-
-Server Options:
-    -a, --addr <host>                Bind to host address (default: 0.0.0.0)
-    -p, --port <port>                Use port for clients (default: 4222)
-    -P, --pid <file>                 File to store PID
-    -m, --http_port <port>           Use port for http monitoring
-    -ms,--https_port <port>          Use port for https monitoring
-    -c, --config <file>              Configuration file
-
-Logging Options:
-    -l, --log <file>                 File to redirect log output
-    -T, --logtime                    Timestamp log entries (default: true)
-    -s, --syslog                     Enable syslog as log method
-    -r, --remote_syslog <addr>       Syslog server addr (udp://localhost:514)
-    -D, --debug                      Enable debugging output
-    -V, --trace                      Trace the raw protocol
-    -DV                              Debug and trace
-
-Authorization Options:
-        --user <user>                User required for connections
-        --pass <password>            Password required for connections
-        --auth <token>               Authorization token required for connections
-
-TLS Options:
-        --tls                        Enable TLS, do not verify clients (default: false)
-        --tlscert <file>             Server certificate file
-        --tlskey <file>              Private key for server certificate
-        --tlsverify                  Enable TLS, very client certificates
-        --tlscacert <file>           Client certificate CA for verification
-
-Cluster Options:
-        --routes <rurl-1, rurl-2>    Routes to solicit and connect
-        --cluster <cluster-url>      Cluster URL for solicited routes
-
-Common Options:
-    -h, --help                       Show this message
-    -v, --version                    Show version
-        --help_tls                   TLS help
-`
-
-// Usage will print out the flag options for the server.
-func Usage() {
-	fmt.Printf("%s\n", usageStr)
-	os.Exit(0)
-}