diff --git a/Makefile b/Makefile index 98858ba..104c122 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,6 @@ VERSION := $(shell git describe --always --dirty=-dirty) ARCH := $(shell uname -m) UNAME_S := $(shell uname -s) GOLDFLAGS += -X main.Version=$(VERSION) -GOLDFLAGS += -X main.Buildarch=$(ARCH) GOFLAGS := -ldflags "$(GOLDFLAGS)" default: clean debug diff --git a/cmd/httpd/main.go b/cmd/httpd/main.go index c105754..9a2bca3 100644 --- a/cmd/httpd/main.go +++ b/cmd/httpd/main.go @@ -13,15 +13,13 @@ import ( ) var ( - Appname string = "CHANGEME" - Version string - Buildarch string + Appname string = "CHANGEME" + Version string ) func main() { globals.Appname = Appname globals.Version = Version - globals.Buildarch = Buildarch fx.New( fx.Provide( @@ -36,5 +34,4 @@ func main() { ), fx.Invoke(func(*server.Server) {}), ).Run() - // os.Exit(server.Run(Appname, Version, Buildarch)) } diff --git a/internal/globals/globals.go b/internal/globals/globals.go index e2ed2c8..a2eb479 100644 --- a/internal/globals/globals.go +++ b/internal/globals/globals.go @@ -6,22 +6,19 @@ import ( // these get populated from main() and copied into the Globals object. var ( - Appname string - Version string - Buildarch string + Appname string + Version string ) type Globals struct { - Appname string - Version string - Buildarch string + Appname string + Version string } func New(lc fx.Lifecycle) (*Globals, error) { n := &Globals{ - Appname: Appname, - Buildarch: Buildarch, - Version: Version, + Appname: Appname, + Version: Version, } return n, nil } diff --git a/internal/logger/logger.go b/internal/logger/logger.go index 1597482..e674cdc 100644 --- a/internal/logger/logger.go +++ b/internal/logger/logger.go @@ -64,6 +64,5 @@ func (l *Logger) Identify() { l.log.Info("starting", "appname", l.params.Globals.Appname, "version", l.params.Globals.Version, - "buildarch", l.params.Globals.Buildarch, ) }