Merge pull request #1017 from weaveworks/log-version-on-startup

Log the daemon version on startup
fluxcd · Mar 23, 2018 · 3d56be4 · 3d56be4
2 parents 7f1b0fa + 6911497
commit 3d56be4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/cmd/fluxd/checkpoint.go b/cmd/fluxd/checkpoint.go
@@ -18,10 +18,10 @@ func checkForUpdates(clusterString string, gitString string, logger log.Logger)
 			return
 		}
 		if r.Outdated {
-			logger.Log("msg", "update available", "version", r.CurrentVersion, "URL", r.CurrentDownloadURL)
+			logger.Log("msg", "update available", "latest", r.CurrentVersion, "URL", r.CurrentDownloadURL)
 			return
 		}
-		logger.Log("msg", "up to date", "version", r.CurrentVersion)
+		logger.Log("msg", "up to date", "latest", r.CurrentVersion)
 	}
 
 	flags := map[string]string{

diff --git a/cmd/fluxd/main.go b/cmd/fluxd/main.go
@@ -36,7 +36,7 @@ import (
 	"github.com/weaveworks/flux/ssh"
 )
 
-var version string
+var version = "unversioned"
 
 const (
 	// The number of connections chosen for memcache and remote GETs should match for best performance (hence the single hardcoded value)
@@ -117,9 +117,6 @@ func main() {
 
 	fs.Parse(os.Args)
 
-	if version == "" {
-		version = "unversioned"
-	}
 	if *versionFlag {
 		fmt.Println(version)
 		os.Exit(0)
@@ -132,7 +129,7 @@ func main() {
 		logger = log.With(logger, "ts", log.DefaultTimestampUTC)
 		logger = log.With(logger, "caller", log.DefaultCaller)
 	}
-	logger.Log("started", true)
+	logger.Log("version", version)
 
 	// Argument validation