mirrors/maddy
1
0
Fork 0
mirror of https://github.com/foxcpp/maddy.git synced 2025-04-05 05:57:39 +03:00
Code Issues Projects Releases Packages Wiki Activity

Include build metadata in -v output

Browse source
This commit is contained in:
fox.cpp 2020-03-13 03:09:11 +03:00
parent ff6eee17eb
commit 47f3d2951e
No known key found for this signature in database
GPG key ID: E76D97CCEDE90B6C
2 changed files with 18 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
docs/man/maddy.1.scd
View file

@ -37,6 +37,9 @@ necessary to run secure email server implemented in one executable.
*-debug* *-debug*
Enable debug log. You want to use it when reporting bugs. Enable debug log. You want to use it when reporting bugs.
*-v*
Print version & build metadata.
# Modules # Modules
maddy is built of many small components called "modules". Each module does one maddy is built of many small components called "modules". Each module does one

23
maddy.go
View file

@ -42,7 +42,7 @@ import (
) )
var ( var (
Version = "unknown (built from source tree)" Version = "go-build"
// ConfigDirectory specifies platform-specific value // ConfigDirectory specifies platform-specific value
// that should be used as a location of default configuration // that should be used as a location of default configuration
@ -91,13 +91,20 @@ var (
) )
func BuildInfo() string { func BuildInfo() string {
if info, ok := debug.ReadBuildInfo(); ok { version := Version
if info.Main.Version == "(devel)" { if info, ok := debug.ReadBuildInfo(); ok && info.Main.Version != "(devel)" {
return Version version = info.Main.Version
} }
return info.Main.Version + " " + info.Main.Sum
} return fmt.Sprintf(`%s %s/%s %s
return Version + " (GOPATH build)"
default config: %s
default state_dir: %s
default runtime_dir: %s`,
version, runtime.GOOS, runtime.GOARCH, runtime.Version(),
filepath.Join(ConfigDirectory, "maddy.conf"),
DefaultStateDirectory,
DefaultRuntimeDirectory)
} }
// Run is the entry point for all maddy code. It takes care of command line arguments parsing, // Run is the entry point for all maddy code. It takes care of command line arguments parsing,
@ -110,7 +117,7 @@ func Run() int {
var ( var (
configPath = flag.String("config", filepath.Join(ConfigDirectory, "maddy.conf"), "path to configuration file") configPath = flag.String("config", filepath.Join(ConfigDirectory, "maddy.conf"), "path to configuration file")
logTargets = flag.String("log", "stderr", "default logging target(s)") logTargets = flag.String("log", "stderr", "default logging target(s)")
printVersion = flag.Bool("v", false, "print version and exit") printVersion = flag.Bool("v", false, "print versio, build metadata and exit")
) )
if enableDebugFlags { if enableDebugFlags {