From 0f354841e3d85c65bfdb8086459e8f0bc8903ca7 Mon Sep 17 00:00:00 2001 From: Sergey Matveev Date: Sun, 29 Mar 2015 11:50:36 +0300 Subject: [PATCH] Version should include compiler's version too Signed-off-by: Sergey Matveev --- cmd/govpn-client/main.go | 2 +- cmd/govpn-server/main.go | 2 +- common.go | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/cmd/govpn-client/main.go b/cmd/govpn-client/main.go index 82a89a6..8b621c8 100644 --- a/cmd/govpn-client/main.go +++ b/cmd/govpn-client/main.go @@ -86,7 +86,7 @@ func main() { termSignal := make(chan os.Signal, 1) signal.Notify(termSignal, os.Interrupt, os.Kill) - log.Println("Client version", govpn.Version) + log.Println(govpn.VersionGet()) log.Println("Starting handshake") handshake := govpn.HandshakeStart(conn, remote, id, key) diff --git a/cmd/govpn-server/main.go b/cmd/govpn-server/main.go index 1ce5a37..b129f2d 100644 --- a/cmd/govpn-server/main.go +++ b/cmd/govpn-server/main.go @@ -116,7 +116,7 @@ func main() { var ethEvent EthEvent ethSink := make(chan EthEvent) - log.Println("Server version", govpn.Version) + log.Println(govpn.VersionGet()) log.Println("Server started") MainCycle: diff --git a/common.go b/common.go index 4d8442e..7eb4060 100644 --- a/common.go +++ b/common.go @@ -24,6 +24,7 @@ import ( "log" "os" "os/exec" + "runtime" ) var ( @@ -76,3 +77,7 @@ func sliceZero(data []byte) { data[i] = '\x00' } } + +func VersionGet() string { + return "GoVPN version " + Version + " built with " + runtime.Version() +} -- 2.44.0