From 895a9449f73e846de8f260e90f88a0238f688035 Mon Sep 17 00:00:00 2001 From: ache Date: Thu, 18 Mar 2021 03:34:05 +0100 Subject: Port configuration --- server.go | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'server.go') diff --git a/server.go b/server.go index aed70d8..aa4a6a5 100644 --- a/server.go +++ b/server.go @@ -396,18 +396,23 @@ func handleMethod( w http.ResponseWriter, r *http.Request) { func main() { var dirRoot string var help, version bool + var port = -1 helpString := `This is the help` versionString := "0.0.0" const ( defaultRoot = "." + defaultPort = 8080 + portUsage = "port to listen" usageDir = "the directory to serve" usageHelp = "show some help" usageVersion = "show the version" ) flag.StringVar(&dirRoot, "directory", "", usageDir) flag.StringVar(&dirRoot, "d", "", usageDir + " (shorthand)") + flag.IntVar(&port, "port", 0, portUsage) + flag.IntVar(&port, "p", 0, portUsage + " (shorthand)") flag.BoolVar(&help, "help", false, usageHelp) flag.BoolVar(&help, "h", false, usageHelp+" (shorthand)") flag.BoolVar(&version, "version", false, usageVersion) @@ -432,6 +437,13 @@ func main() { } } + if port == 0 { + port = config.Config.Port + if port == 0 { + port = defaultPort + } + } + if dirRoot == "" { dirRoot = config.Config.RootPath if dirRoot == "" { @@ -461,9 +473,9 @@ func main() { return } - fmt.Println("Launch server on port:", config.Config.Port) + fmt.Println("Launch server on port:", port) http.HandleFunc("/", handleMethod) - log.Fatal(http.ListenAndServe(":" + strconv.Itoa(config.Config.Port), nil)) + log.Fatal(http.ListenAndServe(":" + strconv.Itoa(port), nil)) fmt.Println("Bye bye") } -- cgit v1.2.3