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)
UNAME_S := $(shell uname -s)
GOLDFLAGS += -X main.Version=$(VERSION)
GOLDFLAGS += -X main.Buildarch=$(ARCH)
GOFLAGS := -ldflags "$(GOLDFLAGS)"
default: clean debug

View File

@ -15,13 +15,11 @@ import (
var (
Appname string = "CHANGEME"
Version string
Buildarch 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))
}

View File

@ -8,19 +8,16 @@ import (
var (
Appname string
Version string
Buildarch string
)
type Globals struct {
Appname string
Version string
Buildarch string
}
func New(lc fx.Lifecycle) (*Globals, error) {
n := &Globals{
Appname: Appname,
Buildarch: Buildarch,
Version: Version,
}
return n, nil

View File

@ -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,
)
}