Version now a function

zetaab · Sep 16, 2015 · e4c96e0 · e4c96e0
1 parent ee4ba8b
commit e4c96e0
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 4 deletions.
diff --git a/main.go b/main.go
@@ -37,7 +37,6 @@ var DefaultOrgStore = DefaultSessionManager{}
 var DefaultQuotaStore = DefaultSessionManager{}
 var MonitoringHandler TykEventHandler
 var RPCListener = RPCStorageHandler{}
-var VERSION string = "v1.8.3.2"
 
 var ApiSpecRegister = make(map[string]*APISpec)
 var keyGen = DefaultKeyGenerator{}
@@ -49,6 +48,27 @@ const (
 	OAUTH_PREFIX            string = "oauth-data."
 )
 
+func VERSION() string {
+	var maj, min, patch, rel string
+	maj = strconv.Itoa(MAJOR)
+	min = strconv.Itoa(MINOR)
+	patch = strconv.Itoa(PATCH)
+	rel = strconv.Itoa(RELEASE)
+
+	v := strings.Join([]string{
+		maj,
+		min,
+		patch,
+		rel,
+	}, ".")
+
+	if SUFFIX != "" {
+		v = strings.Join([]string{v, SUFFIX}, ".")
+	}
+
+	return v
+}
+
 // Display configuration options
 func displayConfig() {
 	log.Info("--> Listening on port: ", config.ListenPort)
@@ -626,7 +646,7 @@ func init() {
 		--as-version=<version>       The version number to use when inserting
 	`
 
-	arguments, err := docopt.Parse(usage, nil, true, VERSION, false, false)
+	arguments, err := docopt.Parse(usage, nil, true, VERSION(), false, false)
 	if err != nil {
 		log.Warning("Error while parsing arguments: ", err)
 	}
@@ -821,7 +841,7 @@ func main() {
 			go s.Serve(l)
 			displayConfig()
 		} else {
-			log.Printf("Gateway started (%v)", VERSION)
+			log.Printf("Gateway started (%v)", VERSION())
 			go http.Serve(l, nil)
 			displayConfig()
 		}
@@ -847,7 +867,7 @@ func main() {
 			go s.Serve(l)
 			displayConfig()
 		} else {
-			log.Printf("Gateway started (%v)", VERSION)
+			log.Printf("Gateway started (%v)", VERSION())
 			displayConfig()
 			http.Serve(l, nil)
 		}

diff --git a/version.go b/version.go
@@ -0,0 +1,7 @@
+package main
+
+var MAJOR int = 1
+var MINOR int = 8
+var PATCH int = 3
+var RELEASE int = 2
+var SUFFIX string = ""