From 676ae77fad9d618ec1918f217a70e27b67b236e4 Mon Sep 17 00:00:00 2001
From: hunterlong <info@socialeck.com>
Date: Mon, 20 Apr 2020 08:17:22 -0700
Subject: [PATCH] envs

---
 CHANGELOG.md                  |  1 +
 handlers/index.go             |  2 +-
 types/configs/configs_env.go  |  9 ++++-----
 types/configs/configs_form.go | 17 ++++++++---------
 types/configs/methods.go      |  2 +-
 utils/configs.go              |  1 +
 6 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dbf2bed6..2005c81e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 # 0.90.30 (04-19-2020)
 - Attempt to fix Github Actions build process
+- Fix for empty database connection string, and not starting in setup mode
 
 # 0.90.29 (04-19-2020)
 - Added HTTP Redirects for services
diff --git a/handlers/index.go b/handlers/index.go
index 8bb6a6ef..bbfba8df 100644
--- a/handlers/index.go
+++ b/handlers/index.go
@@ -8,7 +8,7 @@ import (
 
 func indexHandler(w http.ResponseWriter, r *http.Request) {
 	if !core.App.Setup {
-		http.Redirect(w, r, "/setup", http.StatusSeeOther)
+		ExecuteResponse(w, r, "base.gohtml", core.App, "setup")
 		return
 	}
 	ExecuteResponse(w, r, "base.gohtml", core.App, nil)
diff --git a/types/configs/configs_env.go b/types/configs/configs_env.go
index a4eaa48a..4d8bbcc8 100644
--- a/types/configs/configs_env.go
+++ b/types/configs/configs_env.go
@@ -56,11 +56,10 @@ func LoadConfigFile(directory string) (*DbConfig, error) {
 		Location:    utils.Directory,
 		SqlFile:     p.GetString("SQL_FILE"),
 	}
-
-	if !utils.FileExists(directory + "/config.yml") {
-		return nil, errors.New(fmt.Sprintf("%s/config.yml does not exist", directory))
-	}
-
 	log.WithFields(utils.ToFields(configs)).Debugln("read config file: " + directory + "/config.yml")
+
+	if configs.DbConn == "" {
+		return configs, errors.New("Starting in setup mode")
+	}
 	return configs, nil
 }
diff --git a/types/configs/configs_form.go b/types/configs/configs_form.go
index 7507ac14..ef0fb4c2 100644
--- a/types/configs/configs_form.go
+++ b/types/configs/configs_form.go
@@ -30,6 +30,14 @@ func LoadConfigForm(r *http.Request) (*DbConfig, error) {
 	}
 
 	p := utils.Params
+	p.Set("DB_CONN", dbConn)
+	p.Set("DB_HOST", dbHost)
+	p.Set("DB_USER", dbUser)
+	p.Set("DB_PORT", dbPort)
+	p.Set("DB_PASS", dbPass)
+	p.Set("DB_DATABASE", dbDatabase)
+	p.Set("NAME", project)
+	p.Set("DESCRIPTION", description)
 
 	confg := &DbConfig{
 		DbConn:      dbConn,
@@ -47,15 +55,6 @@ func LoadConfigForm(r *http.Request) (*DbConfig, error) {
 		Location:    utils.Directory,
 	}
 
-	p.Set("DB_CONN", dbConn)
-	p.Set("DB_HOST", dbHost)
-	p.Set("DB_USER", dbUser)
-	p.Set("DB_PORT", dbPort)
-	p.Set("DB_PASS", dbPass)
-	p.Set("DB_DATABASE", dbDatabase)
-	p.Set("NAME", project)
-	p.Set("DESCRIPTION", description)
-
 	return confg, nil
 
 }
diff --git a/types/configs/methods.go b/types/configs/methods.go
index 074fb024..2fef76f5 100644
--- a/types/configs/methods.go
+++ b/types/configs/methods.go
@@ -4,7 +4,7 @@ import "github.com/statping/statping/utils"
 
 // Save will initially create the config.yml file
 func (d *DbConfig) Save(directory string) error {
-	if err := utils.Params.SafeWriteConfigAs(directory + "/config.yml"); err != nil {
+	if err := utils.Params.WriteConfigAs(directory + "/config.yml"); err != nil {
 		return nil
 	}
 	return nil
diff --git a/utils/configs.go b/utils/configs.go
index bf318bd5..477a7894 100644
--- a/utils/configs.go
+++ b/utils/configs.go
@@ -41,6 +41,7 @@ func setDefaults() {
 	Directory = Params.GetString("STATPING_DIR")
 	Params.SetDefault("STATPING_DIR", Directory)
 	Params.SetDefault("GO_ENV", "")
+	Params.SetDefault("DB_CONN", "")
 	Params.SetDefault("DISABLE_LOGS", false)
 	Params.SetDefault("USE_ASSETS", false)
 	Params.SetDefault("BASE_PATH", "")