github-mirror/caddy
2
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-11-25 09:40:13 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

cmd: export CaddyVersion(), Commands() (#4316)

Browse Source 
* cmd: Export CaddyVersion()

* cmd: Add getter Commands()
This commit is contained in:
peymaneh 2021-09-02 02:08:02 +02:00 committed by GitHub
parent 105dac8c2a
commit 9f6393c64c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/commandfuncs.go
View File

@ -331,7 +331,7 @@ func cmdReload(fl Flags) (int, error) {
} }
func cmdVersion(_ Flags) (int, error) { func cmdVersion(_ Flags) (int, error) {
fmt.Println(caddyVersion()) fmt.Println(CaddyVersion())
return caddy.ExitCodeSuccess, nil return caddy.ExitCodeSuccess, nil
} }

6
cmd/commands.go
View File

@ -61,6 +61,12 @@ type Command struct {
// any error that occurred. // any error that occurred.
type CommandFunc func(Flags) (int, error) 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) var commands = make(map[string]Command)
func init() { func init() {

6
cmd/main.go
View File

@ -420,7 +420,7 @@ func printEnvironment() {
fmt.Printf("caddy.AppDataDir=%s\n", caddy.AppDataDir()) fmt.Printf("caddy.AppDataDir=%s\n", caddy.AppDataDir())
fmt.Printf("caddy.AppConfigDir=%s\n", caddy.AppConfigDir()) fmt.Printf("caddy.AppConfigDir=%s\n", caddy.AppConfigDir())
fmt.Printf("caddy.ConfigAutosavePath=%s\n", caddy.ConfigAutosavePath) 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.GOOS=%s\n", runtime.GOOS)
fmt.Printf("runtime.GOARCH=%s\n", runtime.GOARCH) fmt.Printf("runtime.GOARCH=%s\n", runtime.GOARCH)
fmt.Printf("runtime.Compiler=%s\n", runtime.Compiler) fmt.Printf("runtime.Compiler=%s\n", runtime.Compiler)
@ -437,8 +437,8 @@ func printEnvironment() {
} }
} }
// caddyVersion returns a detailed version string, if available. // CaddyVersion returns a detailed version string, if available.
func caddyVersion() string { func CaddyVersion() string {
goModule := caddy.GoModule() goModule := caddy.GoModule()
ver := goModule.Version ver := goModule.Version
if goModule.Sum != "" { if goModule.Sum != "" {