From 3a483526b667b4d4067e5cdaa8d2e683ad4bc95d Mon Sep 17 00:00:00 2001 From: eikendev Date: Mon, 11 Apr 2022 15:47:34 +0200 Subject: [PATCH] Print version upon startup --- Makefile | 4 +++- cmd/pushbits/main.go | 8 +++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 5b3a535..4ed7ae8 100644 --- a/Makefile +++ b/Makefile @@ -5,12 +5,14 @@ DOCS_DIR := ./docs OUT_DIR := ./out TESTS_DIR := ./tests +VERSION := `git describe --tags` + SEMGREP_MODFILE := $(TESTS_DIR)/semgrep-rules/go.mod .PHONY: build build: mkdir -p $(OUT_DIR) - go build -ldflags="-w -s" -o $(OUT_DIR)/pushbits ./cmd/pushbits + go build -ldflags="-w -s -X main.Version=$(VERSION)" -o $(OUT_DIR)/pushbits ./cmd/pushbits .PHONY: clean clean: diff --git a/cmd/pushbits/main.go b/cmd/pushbits/main.go index 30d9c50..5bf37e3 100644 --- a/cmd/pushbits/main.go +++ b/cmd/pushbits/main.go @@ -14,6 +14,8 @@ import ( "github.com/pushbits/server/internal/runner" ) +var Version string + func setupCleanup(db *database.Database, dp *dispatcher.Dispatcher) { c := make(chan os.Signal) signal.Notify(c, os.Interrupt, syscall.SIGTERM) @@ -42,7 +44,11 @@ func setupCleanup(db *database.Database, dp *dispatcher.Dispatcher) { // @securityDefinitions.basic BasicAuth func main() { - log.Println("Starting PushBits.") + if len(Version) == 0 { + log.Panic("Version not set") + } else { + log.Printf("Starting PushBits %s", Version) + } c := configuration.Get()