feat: print version

soerenschneider · Sep 28, 2021 · 529cc31 · 529cc31
1 parent 9707422
commit 529cc31
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 6 deletions.
diff --git a/cmd/client/client.go b/cmd/client/client.go
@@ -25,14 +25,19 @@ var configPathPreferences = []string{
 }
 
 func main() {
-	util.InitLogging()
-
-	metrics.Version.WithLabelValues(internal.BuildVersion, internal.CommitHash, internal.BuildTime).SetToCurrentTime()
+	metrics.Version.WithLabelValues(internal.BuildVersion, internal.CommitHash).SetToCurrentTime()
 	defaultConfigPath := checkDefaultConfigFiles()
 	configPath := flag.String("config", defaultConfigPath, "Path to the config file")
 	once := flag.Bool("once", false, "Path to the config file")
+	version := flag.Bool("version", false, "Print version and exit")
 	flag.Parse()
 
+	if *version {
+		fmt.Printf("%s (commit: %s)", internal.BuildVersion, internal.CommitHash)
+		os.Exit(0)
+	}
+
+	util.InitLogging()
 	if nil == configPath {
 		log.Fatal().Msgf("No config path supplied")
 	}

diff --git a/cmd/server/server.go b/cmd/server/server.go
@@ -2,6 +2,7 @@ package main
 
 import (
 	"dyndns/conf"
+	"dyndns/internal"
 	"dyndns/internal/common"
 	"dyndns/internal/events/mqtt"
 	"dyndns/internal/metrics"
@@ -11,6 +12,7 @@ import (
 	"dyndns/server/vault"
 	"encoding/json"
 	"flag"
+	"fmt"
 	"github.com/aws/aws-sdk-go/aws/credentials"
 	paho "github.com/eclipse/paho.mqtt.golang"
 	"github.com/rs/zerolog/log"
@@ -25,11 +27,17 @@ const notificationTopic = "dyndns/+"
 var requestsChannel = make(chan common.Envelope)
 
 func main() {
-	util.InitLogging()
-
+	metrics.Version.WithLabelValues(internal.BuildVersion, internal.CommitHash).SetToCurrentTime()
 	configPath := flag.String("config", defaultConfigPath, "Path to the config file")
+	version := flag.Bool("version", false, "Print version and exit")
 	flag.Parse()
 
+	if *version {
+		fmt.Printf("%s (commit: %s)", internal.BuildVersion, internal.CommitHash)
+		os.Exit(0)
+	}
+
+	util.InitLogging()
 	if nil == configPath {
 		log.Fatal().Msgf("No config path supplied")
 	}

diff --git a/internal/metrics/metrics.go b/internal/metrics/metrics.go
@@ -19,7 +19,7 @@ var (
 	Version = promauto.NewGaugeVec(prometheus.GaugeOpts{
 		Namespace: namespace,
 		Name:      "version",
-	}, []string{"version", "hash", "built_at"})
+	}, []string{"version", "hash"})
 
 	DnsPropagationRequestsTotal = promauto.NewCounter(prometheus.CounterOpts{
 		Namespace: namespace,