gogrlx/nats-server
1
0
Fork 0
mirror of https://github.com/gogrlx/nats-server.git synced 2026-04-02 11:48:43 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #624 from nats-io/injected-version

Browse Source 
[ADDED] Print release's GitCommit in the banner
This commit is contained in:
Ivan Kozlovic
2018-02-26 09:25:05 -07:00
committed by GitHub
parent 163ba3f6a7 3aa1a75849
commit f8f1f026e2
4 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@@ -5,7 +5,7 @@ MAINTAINER Derek Collison <derek@apcera.com>
COPY . /go/src/github.com/nats-io/gnatsd
WORKDIR /go/src/github.com/nats-io/gnatsd
RUN CGO_ENABLED=0 go install -v -a -tags netgo -installsuffix netgo -ldflags "-s -w -X github.com/nats-io/gnatsd/version.GITCOMMIT=`git rev-parse --short HEAD`"
RUN CGO_ENABLED=0 go install -v -a -tags netgo -installsuffix netgo -ldflags "-s -w -X github.com/nats-io/gnatsd/server.gitCommit=`git rev-parse --short HEAD`"
EXPOSE 4222 8222
ENTRYPOINT ["gnatsd"]

8
Dockerfile.all
View File

@@ -5,10 +5,10 @@ MAINTAINER Ivan Kozlovic <ivan.kozlovic@apcera.com>
COPY . /go/src/github.com/nats-io/gnatsd
WORKDIR /go/src/github.com/nats-io/gnatsd
RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -v -a -tags netgo -installsuffix netgo -ldflags "-s -w -X github.com/nats-io/gnatsd/version.GITCOMMIT=`git rev-parse --short HEAD`" -o pkg/linux-amd64/gnatsd
RUN CGO_ENABLED=0 GOOS=linux GOARCH=arm GOARM=7 go build -v -a -tags netgo -installsuffix netgo -ldflags "-s -w -X github.com/nats-io/gnatsd/version.GITCOMMIT=`git rev-parse --short HEAD`" -o pkg/linux-arm7/gnatsd
RUN CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -v -a -tags netgo -installsuffix netgo -ldflags "-s -w -X github.com/nats-io/gnatsd/version.GITCOMMIT=`git rev-parse --short HEAD`" -o pkg/linux-arm64/gnatsd
RUN CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -v -a -tags netgo -installsuffix netgo -ldflags "-s -w -X github.com/nats-io/gnatsd/version.GITCOMMIT=`git rev-parse --short HEAD`" -o pkg/win-amd64/gnatsd.exe
RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -v -a -tags netgo -installsuffix netgo -ldflags "-s -w -X github.com/nats-io/gnatsd/server.gitCommit=`git rev-parse --short HEAD`" -o pkg/linux-amd64/gnatsd
RUN CGO_ENABLED=0 GOOS=linux GOARCH=arm GOARM=7 go build -v -a -tags netgo -installsuffix netgo -ldflags "-s -w -X github.com/nats-io/gnatsd/server.gitCommit=`git rev-parse --short HEAD`" -o pkg/linux-arm7/gnatsd
RUN CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -v -a -tags netgo -installsuffix netgo -ldflags "-s -w -X github.com/nats-io/gnatsd/server.gitCommit=`git rev-parse --short HEAD`" -o pkg/linux-arm64/gnatsd
RUN CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -v -a -tags netgo -installsuffix netgo -ldflags "-s -w -X github.com/nats-io/gnatsd/server.gitCommit=`git rev-parse --short HEAD`" -o pkg/win-amd64/gnatsd.exe
ENTRYPOINT ["go"]
CMD ["version"]

5
server/const.go
View File

@@ -17,6 +17,11 @@ const (
CommandReload = Command("reload")
)
var (
// gitCommit injected at build
gitCommit string
)
const (
// VERSION is the current version for the server.
VERSION = "1.0.4"

6
server/server.go
View File

@@ -29,6 +29,7 @@ import (
type Info struct {
ID string `json:"server_id"`
Version string `json:"version"`
GitCommit string `json:"git_commit"`
GoVersion string `json:"go"`
Host string `json:"host"`
Port int `json:"port"`
@@ -118,6 +119,7 @@ func New(opts *Options) *Server {
info := Info{
ID: genID(),
Version: VERSION,
GitCommit: gitCommit,
GoVersion: runtime.Version(),
Host: opts.Host,
Port: opts.Port,
@@ -252,6 +254,10 @@ func (s *Server) logPid() error {
func (s *Server) Start() {
s.Noticef("Starting nats-server version %s", VERSION)
s.Debugf("Go build version %s", s.info.GoVersion)
if gitCommit == "" {
gitCommit = "not set"
}
s.Noticef("Git commit [%s]", gitCommit)
// Avoid RACE between Start() and Shutdown()
s.mu.Lock()