Browse Source
cmd: export CaddyVersion(), Commands() (#4316)
* cmd: Export CaddyVersion()
* cmd: Add getter Commands()
master
peymaneh
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with
10 additions and
4 deletions
-
cmd/commandfuncs.go
-
cmd/commands.go
-
cmd/main.go
|
|
@ -331,7 +331,7 @@ func cmdReload(fl Flags) (int, error) { |
|
|
|
} |
|
|
|
|
|
|
|
func cmdVersion(_ Flags) (int, error) { |
|
|
|
fmt.Println(caddyVersion()) |
|
|
|
fmt.Println(CaddyVersion()) |
|
|
|
return caddy.ExitCodeSuccess, nil |
|
|
|
} |
|
|
|
|
|
|
|
|
|
@ -61,6 +61,12 @@ type Command struct { |
|
|
|
// any error that occurred.
|
|
|
|
type CommandFunc func(Flags) (int, error) |
|
|
|
|
|
|
|
// Commands returns a list of commands initialised by
|
|
|
|
// RegisterCommand
|
|
|
|
func Commands() map[string]Command { |
|
|
|
return commands |
|
|
|
} |
|
|
|
|
|
|
|
var commands = make(map[string]Command) |
|
|
|
|
|
|
|
func init() { |
|
|
|
|
|
@ -420,7 +420,7 @@ func printEnvironment() { |
|
|
|
fmt.Printf("caddy.AppDataDir=%s\n", caddy.AppDataDir()) |
|
|
|
fmt.Printf("caddy.AppConfigDir=%s\n", caddy.AppConfigDir()) |
|
|
|
fmt.Printf("caddy.ConfigAutosavePath=%s\n", caddy.ConfigAutosavePath) |
|
|
|
fmt.Printf("caddy.Version=%s\n", caddyVersion()) |
|
|
|
fmt.Printf("caddy.Version=%s\n", CaddyVersion()) |
|
|
|
fmt.Printf("runtime.GOOS=%s\n", runtime.GOOS) |
|
|
|
fmt.Printf("runtime.GOARCH=%s\n", runtime.GOARCH) |
|
|
|
fmt.Printf("runtime.Compiler=%s\n", runtime.Compiler) |
|
|
@ -437,8 +437,8 @@ func printEnvironment() { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
// caddyVersion returns a detailed version string, if available.
|
|
|
|
func caddyVersion() string { |
|
|
|
// CaddyVersion returns a detailed version string, if available.
|
|
|
|
func CaddyVersion() string { |
|
|
|
goModule := caddy.GoModule() |
|
|
|
ver := goModule.Version |
|
|
|
if goModule.Sum != "" { |
|
|
|