Fast and extensible multi-platform HTTP/1-2-3 web server with automatic HTTPS
Mirrored from https://github.com/Slazee/caddy.git
Synced Nov 14, 05:15 UTC
cmd: export CaddyVersion(), Commands() (#4316)
* cmd: Export CaddyVersion() * cmd: Add getter Commands()
peymaneh committed
Sep 2, 2021 at 02:08 UTC
9f6393c64cd8dc969358d47fb96410d8ee5c063d
3 files changed
+10
-4
cmd/commandfuncs.go
+1
-1
@@ -331,7 +331,7 @@ func cmdReload(fl Flags) (int, error) {
331
}
332
333
func cmdVersion(_ Flags) (int, error) {
334
- fmt.Println(caddyVersion())
334
+ fmt.Println(CaddyVersion())
335
return caddy.ExitCodeSuccess, nil
336
}
337
cmd/commands.go
+6
@@ -61,6 +61,12 @@ type Command struct {
61
// any error that occurred.
62
type CommandFunc func(Flags) (int, error)
63
64
+// Commands returns a list of commands initialised by
65
+// RegisterCommand
66
+func Commands() map[string]Command {
67
+ return commands
68
+}
69
+
70
var commands = make(map[string]Command)
71
72
func init() {
cmd/main.go
+3
-3
@@ -420,7 +420,7 @@ func printEnvironment() {
420
fmt.Printf("caddy.AppDataDir=%s\n", caddy.AppDataDir())
421
fmt.Printf("caddy.AppConfigDir=%s\n", caddy.AppConfigDir())
422
fmt.Printf("caddy.ConfigAutosavePath=%s\n", caddy.ConfigAutosavePath)
423
- fmt.Printf("caddy.Version=%s\n", caddyVersion())
423
+ fmt.Printf("caddy.Version=%s\n", CaddyVersion())
424
fmt.Printf("runtime.GOOS=%s\n", runtime.GOOS)
425
fmt.Printf("runtime.GOARCH=%s\n", runtime.GOARCH)
426
fmt.Printf("runtime.Compiler=%s\n", runtime.Compiler)
@@ -437,8 +437,8 @@ func printEnvironment() {
437
}
438
}
439
440
-// caddyVersion returns a detailed version string, if available.
441
-func caddyVersion() string {
440
+// CaddyVersion returns a detailed version string, if available.
441
+func CaddyVersion() string {
442
goModule := caddy.GoModule()
443
ver := goModule.Version
444
if goModule.Sum != "" {