remove Buildarch from globals - is available at runtime

This commit is contained in:
Jeffrey Paul 2026-01-11 04:05:11 -08:00
parent f7ab09c2c3
commit 4d746027dc
4 changed files with 8 additions and 16 deletions

View File

@ -4,7 +4,6 @@ VERSION := $(shell git describe --always --dirty=-dirty)
ARCH := $(shell uname -m) ARCH := $(shell uname -m)
UNAME_S := $(shell uname -s) UNAME_S := $(shell uname -s)
GOLDFLAGS += -X main.Version=$(VERSION) GOLDFLAGS += -X main.Version=$(VERSION)
GOLDFLAGS += -X main.Buildarch=$(ARCH)
GOFLAGS := -ldflags "$(GOLDFLAGS)" GOFLAGS := -ldflags "$(GOLDFLAGS)"
default: clean debug default: clean debug

View File

@ -13,15 +13,13 @@ import (
) )
var ( var (
Appname string = "CHANGEME" Appname string = "CHANGEME"
Version string Version string
Buildarch string
) )
func main() { func main() {
globals.Appname = Appname globals.Appname = Appname
globals.Version = Version globals.Version = Version
globals.Buildarch = Buildarch
fx.New( fx.New(
fx.Provide( fx.Provide(
@ -36,5 +34,4 @@ func main() {
), ),
fx.Invoke(func(*server.Server) {}), fx.Invoke(func(*server.Server) {}),
).Run() ).Run()
// os.Exit(server.Run(Appname, Version, Buildarch))
} }

View File

@ -6,22 +6,19 @@ import (
// these get populated from main() and copied into the Globals object. // these get populated from main() and copied into the Globals object.
var ( var (
Appname string Appname string
Version string Version string
Buildarch string
) )
type Globals struct { type Globals struct {
Appname string Appname string
Version string Version string
Buildarch string
} }
func New(lc fx.Lifecycle) (*Globals, error) { func New(lc fx.Lifecycle) (*Globals, error) {
n := &Globals{ n := &Globals{
Appname: Appname, Appname: Appname,
Buildarch: Buildarch, Version: Version,
Version: Version,
} }
return n, nil return n, nil
} }

View File

@ -64,6 +64,5 @@ func (l *Logger) Identify() {
l.log.Info("starting", l.log.Info("starting",
"appname", l.params.Globals.Appname, "appname", l.params.Globals.Appname,
"version", l.params.Globals.Version, "version", l.params.Globals.Version,
"buildarch", l.params.Globals.Buildarch,
) )
} }