sneak/pixa
1
0
Fork 0
Code Issues 3 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Consolidate appname to internal/globals as a constant #34

Merged
sneak merged 2 commits from consolidate-appname-to-globals into main 2026-03-20 07:04:54 +01:00
Conversation 1 Commits 2 Files Changed 2 +6 -11
2 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit cf825a7260 - Show all commits

6
cmd/pixad/main.go
View File

@@ -17,10 +17,7 @@ import (
"sneak.berlin/go/pixa/internal/server" "sneak.berlin/go/pixa/internal/server"
) )
var ( var Version string //nolint:gochecknoglobals // set by ldflags
Appname = "pixad" //nolint:gochecknoglobals // set by ldflags
Version string //nolint:gochecknoglobals // set by ldflags
)
var configPath string //nolint:gochecknoglobals // cobra flag var configPath string //nolint:gochecknoglobals // cobra flag
@@ -40,7 +37,6 @@ func main() {
} }
func run(_ *cobra.Command, _ []string) { func run(_ *cobra.Command, _ []string) {
globals.Appname = Appname
globals.Version = Version globals.Version = Version
// Set config path in environment if specified via flag // Set config path in environment if specified via flag

11
internal/globals/globals.go
View File

@@ -5,11 +5,10 @@ import (
"go.uber.org/fx" "go.uber.org/fx"
) )
// Build-time variables populated from main() via ldflags. const appname = "pixad"
var (
Appname string //nolint:gochecknoglobals // set from main // Version is populated from main() via ldflags.
Version string //nolint:gochecknoglobals // set from main var Version string //nolint:gochecknoglobals // set from main
)
// Globals holds application-wide constants. // Globals holds application-wide constants.
type Globals struct { type Globals struct {
@@ -20,7 +19,7 @@ type Globals struct {
// New creates a new Globals instance from build-time variables. // New creates a new Globals instance from build-time variables.
func New(_ fx.Lifecycle) (*Globals, error) { func New(_ fx.Lifecycle) (*Globals, error) {
return &Globals{ return &Globals{
Appname: Appname, Appname: appname,
Version: Version, Version: Version,
}, nil }, nil
} }