diff --git a/cmd/flags.go b/cmd/flags.go index 4476aca3..afe1986e 100644 --- a/cmd/flags.go +++ b/cmd/flags.go @@ -20,8 +20,16 @@ func parseFlags(cmd *cobra.Command) { utils.Params.BindPFlag("port", cmd.PersistentFlags().Lookup("port")) cmd.PersistentFlags().IntVarP(&verboseMode, "verbose", "v", 2, "verbose logging") - utils.Params.BindPFlag("VERBOSE", cmd.PersistentFlags().Lookup("verbose")) + utils.Params.BindPFlag("verbose", cmd.PersistentFlags().Lookup("verbose")) cmd.PersistentFlags().StringVarP(&configFile, "config", "c", utils.Directory+"/config.yml", "path to config.yml file") utils.Params.BindPFlag("config", cmd.PersistentFlags().Lookup("config")) + + if utils.Params.GetString("SERVER_IP") != ipAddress { + utils.Params.Set("SERVER_IP", ipAddress) + } + + if utils.Params.GetInt("SERVER_PORT") != port { + utils.Params.Set("SERVER_PORT", port) + } } diff --git a/handlers/handlers.go b/handlers/handlers.go index 10811c9d..20eefeb1 100644 --- a/handlers/handlers.go +++ b/handlers/handlers.go @@ -40,8 +40,8 @@ func RunHTTPServer() error { return nil } - ip := utils.Params.GetString("HOST") - host := fmt.Sprintf("%v:%v", ip, utils.Params.GetInt("PORT")) + ip := utils.Params.GetString("SERVER_IP") + host := fmt.Sprintf("%v:%v", ip, utils.Params.GetInt("SERVER_PORT")) key := utils.FileExists(utils.Directory + "/server.key") cert := utils.FileExists(utils.Directory + "/server.crt") diff --git a/utils/env.go b/utils/env.go index 54b53e5c..57a9f1c7 100644 --- a/utils/env.go +++ b/utils/env.go @@ -25,8 +25,8 @@ func InitEnvs() { defaultDir = "." } Params.Set("VERSION", version) - Params.SetDefault("PORT", 8080) - Params.SetDefault("HOST", "0.0.0.0") + Params.SetDefault("SERVER_IP", "0.0.0.0") + Params.SetDefault("SERVER_PORT", 8080) Params.SetDefault("DISABLE_HTTP", false) Params.SetDefault("STATPING_DIR", defaultDir) Params.SetDefault("GO_ENV", "production")