Skip to content

log: fixup version string output by "maddy version" and "maddy run" to be consistent #870

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
foxcpp merged 1 commit into from
Oct 20, 2026
Merged

log: fixup version string output by "maddy version" and "maddy run" to be consistent #870

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions maddy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,18 +87,21 @@ var (
enableDebugFlags = false
)

func BuildInfo() string {
func GetVersion() string {
version := Version
if info, ok := debug.ReadBuildInfo(); ok && info.Main.Version != "(devel)" {
version = strings.TrimPrefix(info.Main.Version, "v")
}
return version
}

func BuildInfo() string {
return fmt.Sprintf(`%s %s/%s %s

default config: %s
default state_dir: %s
default runtime_dir: %s`,
version, runtime.GOOS, runtime.GOARCH, runtime.Version(),
GetVersion(), runtime.GOOS, runtime.GOARCH, runtime.Version(),
filepath.Join(ConfigDirectory, "maddy.conf"),
DefaultStateDirectory,
DefaultRuntimeDirectory)
Expand Down Expand Up @@ -182,7 +185,7 @@ func init() {
// logging initialization, directives setup, configuration reading. After all that, it
// calls moduleMain to initialize and run modules.
func Run(c *cli.Context) error {
certmagic.UserAgent = "maddy/" + Version
certmagic.UserAgent = "maddy/" + GetVersion()

if c.NArg() != 0 {
return cli.Exit(fmt.Sprintln("usage:", os.Args[0], "[options]"), 2)
Expand Down Expand Up @@ -429,7 +432,7 @@ func moduleMain(configPath string) error {
if err := moduleStart(c); err != nil {
return err
}
c.DefaultLogger.Msg("server started", "version", Version)
c.DefaultLogger.Msg("server started", "version", GetVersion())

systemdStatus(SDReady, "Configuration running.")
asyncStopWg := sync.WaitGroup{} // Some containers might still be waiting on moduleStop
Expand Down Expand Up @@ -500,7 +503,7 @@ func moduleReload(oldContainer *container.C, configPath string, asyncStopWg *syn
return oldContainer
}

newContainer.DefaultLogger.Msg("new server started", "version", Version)
newContainer.DefaultLogger.Msg("new server started", "version", GetVersion())

systemdStatus(SDReloading, "New configuration running. Waiting for old connections and transactions to finish...")

Expand Down
Loading