From d66f87485d2a96ad9723c537c3fd11ee27579104 Mon Sep 17 00:00:00 2001 From: Bohdan Horbeshko Date: Tue, 17 Jan 2023 23:42:10 -0500 Subject: [PATCH] Print commit hash --- Makefile | 4 +++- telegabber.go | 9 ++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 1f75f76..48c5d7e 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,9 @@ .PHONY: all test +COMMIT := $(shell git rev-parse --short HEAD) + all: - go build -o telegabber + go build -ldflags "-X main.commit=${COMMIT}" -o telegabber test: go test -v ./config ./ ./telegram ./xmpp ./xmpp/gateway ./persistence ./telegram/formatter diff --git a/telegabber.go b/telegabber.go index 2f5a6b3..903a5c5 100644 --- a/telegabber.go +++ b/telegabber.go @@ -15,7 +15,8 @@ import ( goxmpp "gosrc.io/xmpp" ) -const version string = "1.3.0" +var version string = "1.4.0-dev" +var commit string var sm *goxmpp.StreamManager var component *goxmpp.Component @@ -25,6 +26,10 @@ var cleanupDone chan struct{} var sigintChannel chan os.Signal func main() { + if commit != "" { + version = fmt.Sprintf("%v-%v", version, commit) + } + var profilingPort = flag.Int("profiling-port", 0, "The port for pprof server") // YAML config, compatible with the format of Zhabogram 2.0.0 var configPath = flag.String("config", "config.yml", "Config file path") @@ -55,6 +60,8 @@ func main() { SetLogrusLevel(config.XMPP.Loglevel) + log.Infof("Starting telegabber version %v", version) + sm, component, err = xmpp.NewComponent(config.XMPP, config.Telegram) if err != nil { log.Fatal(err)