diff --git a/config.go b/config.go index 9178107..c101f24 100644 --- a/config.go +++ b/config.go @@ -11,7 +11,6 @@ type Config struct { ListenAddr *string NbWorkers *int Debug *bool - Version *bool Timeout *int ScriptDir *string } @@ -20,7 +19,6 @@ var config = &Config{ ListenAddr: flag.String("listen", getEnv("LISTEN_ADDR", ":8080"), "HTTP service address (e.g.address, ':8080')"), NbWorkers: flag.Int("nb-workers", getIntEnv("NB_WORKERS", 2), "The number of workers to start"), Debug: flag.Bool("debug", getBoolEnv("DEBUG", false), "Output debug logs"), - Version: flag.Bool("version", false, "Output version"), Timeout: flag.Int("timeout", getIntEnv("HOOK_TIMEOUT", 10), "Hook maximum delay before timeout (in second)"), ScriptDir: flag.String("scripts", getEnv("SCRIPTS_DIR", "scripts"), "Scripts directory"), } diff --git a/main.go b/main.go index e6e1ba1..d03343c 100644 --- a/main.go +++ b/main.go @@ -16,9 +16,6 @@ import ( "github.com/ncarlier/webhookd/pkg/worker" ) -// Version of the app -var Version = "snapshot" - type key int const ( @@ -32,8 +29,8 @@ var ( func main() { flag.Parse() - if *config.Version { - fmt.Println(Version) + if *version { + printVersion() return } diff --git a/version.go b/version.go new file mode 100644 index 0000000..c6bb5a6 --- /dev/null +++ b/version.go @@ -0,0 +1,22 @@ +package main + +import ( + "flag" + "fmt" +) + +// Version of the app +var Version = "snapshot" + +var ( + version = flag.Bool("version", false, "Print version") +) + +func printVersion() { + fmt.Printf(`webhookd (%s) +Copyright (C) 2018 Nunux, Org. +This is free software: you are free to change and redistribute it. +There is NO WARRANTY, to the extent permitted by law. + +Written by Nicolas Carlier.`, Version) +}