From fb2a9fe067af4a4ac02686fdc672b4c2c9a2457d Mon Sep 17 00:00:00 2001 From: hunterlong Date: Sat, 13 Jun 2020 18:39:47 -0700 Subject: [PATCH 1/3] CLI fixes for PORT and IP/HOST --- cmd/flags.go | 10 +++++++++- handlers/handlers.go | 4 ++-- utils/env.go | 4 ++-- 3 files changed, 13 insertions(+), 5 deletions(-) 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") From 622d697c6bb9f42d355355f15510a4f58433afb1 Mon Sep 17 00:00:00 2001 From: hunterlong Date: Sat, 13 Jun 2020 18:45:04 -0700 Subject: [PATCH 2/3] CLI fixes for PORT and IP/HOST --- CHANGELOG.md | 4 ++++ cmd/database.go | 22 ---------------------- version.txt | 2 +- 3 files changed, 5 insertions(+), 23 deletions(-) delete mode 100644 cmd/database.go diff --git a/CHANGELOG.md b/CHANGELOG.md index becca95c..4eb49a14 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# 0.90.50 (06-13-2020) +- Removed PORT, replaced with SERVER_PORT +- Removed HOST/IP, replaced with SERVER_IP + # 0.90.49 (06-12-2020) - Added additional prometheus /metrics for better debugging diff --git a/cmd/database.go b/cmd/database.go deleted file mode 100644 index c438fac7..00000000 --- a/cmd/database.go +++ /dev/null @@ -1,22 +0,0 @@ -package main - -import ( - "github.com/statping/statping/types/checkins" - "github.com/statping/statping/types/failures" - "github.com/statping/statping/types/groups" - "github.com/statping/statping/types/hits" - "github.com/statping/statping/types/incidents" - "github.com/statping/statping/types/messages" - "github.com/statping/statping/types/notifications" - "github.com/statping/statping/types/services" - "github.com/statping/statping/types/users" -) - -var ( - // DbSession stores the Statping database session - DbModels []interface{} -) - -func init() { - DbModels = []interface{}{&services.Service{}, &users.User{}, &hits.Hit{}, &failures.Failure{}, &messages.Message{}, &groups.Group{}, &checkins.Checkin{}, &checkins.CheckinHit{}, ¬ifications.Notification{}, &incidents.Incident{}, &incidents.IncidentUpdate{}} -} diff --git a/version.txt b/version.txt index 5a2ef2cc..f2a48cdb 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -0.90.49 +0.90.50 From de051d4bcd9ae571dbe01af7c55351d3373b6ae8 Mon Sep 17 00:00:00 2001 From: hunterlong Date: Sat, 13 Jun 2020 19:46:31 -0700 Subject: [PATCH 3/3] CLI fixes for PORT and IP/HOST --- cmd/flags.go | 8 -------- cmd/main.go | 3 +++ handlers/dashboard.go | 1 + utils/env.go | 2 -- 4 files changed, 4 insertions(+), 10 deletions(-) diff --git a/cmd/flags.go b/cmd/flags.go index afe1986e..42407ffe 100644 --- a/cmd/flags.go +++ b/cmd/flags.go @@ -24,12 +24,4 @@ func parseFlags(cmd *cobra.Command) { 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/cmd/main.go b/cmd/main.go index a32d1113..eb8648d2 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -80,6 +80,9 @@ func start() { log.Info(fmt.Sprintf("Starting Statping v%s", VERSION)) + utils.Params.Set("SERVER_IP", ipAddress) + utils.Params.Set("SERVER_PORT", port) + confgs, err = configs.LoadConfigs(configFile) if err != nil { log.Infoln("Starting in Setup Mode") diff --git a/handlers/dashboard.go b/handlers/dashboard.go index 3500d5a3..44a753f5 100644 --- a/handlers/dashboard.go +++ b/handlers/dashboard.go @@ -143,6 +143,7 @@ func removeJwtToken(w http.ResponseWriter) { Name: cookieKey, Value: "", Expires: time.Now(), + MaxAge: -1, }) } diff --git a/utils/env.go b/utils/env.go index 57a9f1c7..295760c9 100644 --- a/utils/env.go +++ b/utils/env.go @@ -25,8 +25,6 @@ func InitEnvs() { defaultDir = "." } Params.Set("VERSION", version) - 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")