support for the -v / --version cli option

go-spatial · Jun 22, 2017 · d476496 · d476496
1 parent 5796068
commit d476496
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 10 deletions.
diff --git a/cmd/tegola/flags.go b/cmd/tegola/flags.go
@@ -9,15 +9,20 @@ import (
 )
 
 var (
-	configFile = *flag.String("config", "config.toml", "")
-	logFile    = *flag.String("log-file", "", "")
-	logFormat  = *flag.String("log-format", server.DefaultLogFormat, "")
-	port       = *flag.String("port", defaultHTTPPort, "")
+	configFile = flag.String("config", "config.toml", "")
+	logFile    = flag.String("log-file", "", "")
+	logFormat  = flag.String("log-format", server.DefaultLogFormat, "")
+	port       = flag.String("port", defaultHTTPPort, "")
+	version    = flag.Bool("version", false, "")
 )
 
 const defaultHTTPPort = ":8080"
 
 func init() {
+	//	short forms
+	flag.StringVar(configFile, "c", "config", "")
+	flag.BoolVar(version, "v", false, "")
+
 	flag.Usage = func() {
 		fmt.Fprintf(os.Stderr, `tegola %v <http://tegola.io>
 MVT tile server with support for PostGIS
@@ -27,7 +32,7 @@ USAGE:	tegola [OPTIONS]
 OPTIONS:
   -h, --help                Print usage
   -v, --version             Print version and quit
-      --config      string  Location of config file in TOML format. Can be local or remote over http(s) (default config.toml)
+  -c, --config      string  Location of config file in TOML format. Can be local or remote over http(s) (default config.toml)
       --port        string  Port to bind HTTP server to (example :8080)
       --log-file    string  The file to write request logs to (default disabled)
       --log-format  string  The format the logger will log with. Available fields:

diff --git a/cmd/tegola/main.go b/cmd/tegola/main.go
@@ -28,9 +28,15 @@ func main() {
 	//	parse our command line flags
 	flag.Parse()
 
+	//	if the user looking for tegola version info, print it and exit
+	if *version {
+		fmt.Println(Version)
+		os.Exit(0)
+	}
+
 	defer setupProfiler().Stop()
 
-	conf, err := config.Load(configFile)
+	conf, err := config.Load(*configFile)
 	if err != nil {
 		log.Fatal(err)
 	}
@@ -51,19 +57,19 @@ func main() {
 		log.Fatal(err)
 	}
 
-	initLogger(logFile, logFormat, conf.Webserver.LogFile, conf.Webserver.LogFormat)
+	initLogger(*logFile, *logFormat, conf.Webserver.LogFile, conf.Webserver.LogFormat)
 
 	//	check config for port setting
-	if port == defaultHTTPPort && conf.Webserver.Port != "" {
-		port = conf.Webserver.Port
+	if *port == defaultHTTPPort && conf.Webserver.Port != "" {
+		port = &conf.Webserver.Port
 	}
 
 	//	set our server version
 	server.Version = Version
 	server.HostName = conf.Webserver.HostName
 
 	//	start our webserver
-	server.Start(port)
+	server.Start(*port)
 }
 
 //	initMaps registers maps with our server