From 21bec9fc783b105e4834061d11b46cda23fd64b5 Mon Sep 17 00:00:00 2001
From: Bryan Boreham <bjboreham@gmail.com>
Date: Fri, 12 Sep 2014 17:53:06 +0100
Subject: [PATCH] Add a -version command to weave and weaver, implemented by
 embedding the build date by the makefile

---
 weaver/Makefile |  2 +-
 weaver/main.go  | 15 +++++++++++++++
 weaver/weave    |  4 ++++
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/weaver/Makefile b/weaver/Makefile
index 7c0ea882..e9ed6733 100644
--- a/weaver/Makefile
+++ b/weaver/Makefile
@@ -3,7 +3,7 @@
 all: docker-image
 
 weaver: ../*.go main.go
-	go build -ldflags '-extldflags "-static"'
+	go build -ldflags="-X main.builddate \"`date -u -Iseconds`\" -extldflags '-static'"
 
 .PHONY: docker-image
 
diff --git a/weaver/main.go b/weaver/main.go
index e11f1c49..bb1d2097 100644
--- a/weaver/main.go
+++ b/weaver/main.go
@@ -18,6 +18,12 @@ import (
 	"time"
 )
 
+var builddate string  // set by the Makefile
+
+func versionString() string {
+	return "Weave of " + builddate
+}
+
 func ensureInterface(ifaceName string, wait bool) (iface *net.Interface, err error) {
 	iface, err = findInterface(ifaceName)
 	if err == nil || !wait {
@@ -62,6 +68,7 @@ func main() {
 		password   string
 		wait       bool
 		debug      bool
+		version    bool
 		prof       string
 		peers      []string
 		connLimit  int
@@ -73,16 +80,21 @@ func main() {
 	flag.StringVar(&password, "password", "", "network password")
 	flag.BoolVar(&wait, "wait", false, "wait for interface to be created and come up")
 	flag.BoolVar(&debug, "debug", false, "enable debug logging")
+	flag.BoolVar(&version, "version", false, "display version information")
 	flag.StringVar(&prof, "profile", "", "enable profiling and write profiles to given path")
 	flag.IntVar(&connLimit, "connlimit", 10, "connection limit (defaults to 10, set to 0 for unlimited)")
 	flag.IntVar(&bufSz, "bufsz", 8, "capture buffer size in MB (defaults to 8MB)")
 	flag.Parse()
 	peers = flag.Args()
 
+	if version {
+		fmt.Println(versionString())
+	}
 	if ifaceName == "" {
 		fmt.Println("Missing required parameter 'iface'")
 		os.Exit(1)
 	}
+	log.Println(versionString(), os.Args)
 	iface, err := ensureInterface(ifaceName, wait)
 	if err != nil {
 		log.Fatal(err)
@@ -139,6 +151,9 @@ func handleHttp(router *weave.Router) {
 	http.HandleFunc("/status", func(w http.ResponseWriter, r *http.Request) {
 		io.WriteString(w, router.Status())
 	})
+	http.HandleFunc("/version", func(w http.ResponseWriter, r *http.Request) {
+		io.WriteString(w, versionString() + "\n")
+	})
 	address := fmt.Sprintf(":%d", weave.StatusPort)
 	err := http.ListenAndServe(address, nil)
 	if err != nil {
diff --git a/weaver/weave b/weaver/weave
index ec57494c..0a7e3fb6 100755
--- a/weaver/weave
+++ b/weaver/weave
@@ -127,6 +127,10 @@ case "$COMMAND" in
 		rest_command status
         exit 0
         ;;
+    version)
+		rest_command version
+        exit 0
+        ;;
     run)
         [ $# -gt 0 ] || usage
         IPADDR=$1