refactor: last bits of env vars

darklab8 · Jun 8, 2024 · 0c5248b · 0c5248b
1 parent d3fe8b6
commit 0c5248b
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 20 deletions.
diff --git a/.vscode/settings.example.json b/.vscode/settings.example.json
@@ -7,9 +7,9 @@
         "SCRAPPY_BASE_URL": "**********", // Not required for dev env if u use "DEVENV_MOCK_API": "true"
         // "DARK_TEST_REGENERATE": "false",
         "DEV_ENV": "true",
+        "DEV_ENV_MOCK_API": "true",
         "DARKBOT_LOG_LEVEL": "INFO",
         "CONFIGURATOR_DBNAME": "dev",
-        "DEVENV_MOCK_API": "true",
         "DISCORDER_BOT_TOKEN": "**********", // Get your own app token at https://discord.com/developers/applications
     },
     "go.testTimeout": "30000s",
@@ -19,9 +19,9 @@
         "SCRAPPY_BASE_URL": "**********", // Not required for dev env if u use "DEVENV_MOCK_API": "true"
         // "DARK_TEST_REGENERATE": "false",
         "DEV_ENV": "true",
+        "DEV_ENV_MOCK_API": "true",
         "DARKBOT_LOG_LEVEL": "INFO",
         "CONFIGURATOR_DBNAME": "dev",
-        "DEVENV_MOCK_API": "true",
         "DISCORDER_BOT_TOKEN": "**********", // Get your own app token at https://discord.com/developers/applications
     }
 }
diff --git a/app/settings/main.go b/app/settings/main.go
@@ -38,23 +38,32 @@ func init() {
 	envs := utils_env.NewEnvConfig()
 	Env = DarkbotEnv{
 		UtilsEnvs:            utils_settings.Envs,
-		ScrappyBaseUrl:       envs.GetEnvWithDefault("SCRAPPY_BASE_URL", "undefined"),
-		ScrappyPlayerUrl:     envs.GetEnvWithDefault("SCRAPPY_PLAYER_URL", "undefined"),
+		DevEnvMockApi:        envs.GetEnvBoolWithDefault("DEV_ENV_MOCK_API", true),
+		ScrappyBaseUrl:       envs.GetEnvWithDefault("SCRAPPY_BASE_URL", ""),
+		ScrappyPlayerUrl:     envs.GetEnvWithDefault("SCRAPPY_PLAYER_URL", ""),
 		ScrappyBaseAttackUrl: envs.GetEnvWithDefault("SCRAPPY_BASE_ATTACK_URL", "https://discoverygc.com/forums/showthread.php?tid=110046&action=lastpost"),
 
-		DiscorderBotToken: envs.GetEnvWithDefault("DISCORDER_BOT_TOKEN", "undefined"),
+		DiscorderBotToken: envs.GetEnvWithDefault("DISCORDER_BOT_TOKEN", ""),
 
 		ConfiguratorDbname: envs.GetEnvWithDefault("CONFIGURATOR_DBNAME", "dev"),
 
 		ConsolerPrefix:   envs.GetEnvWithDefault("CONSOLER_PREFIX", ";"),
-		ProfilingEnabled: envs.GetEnvBool("PROFILING"),
+		ProfilingEnabled: envs.GetEnvBoolWithDefault("PROFILING", false),
 
 		ScrappyLoopDelay: envs.GetIntWithDefault("SCRAPPY_LOOP_DELAY", 10),
 		ViewerLoopDelay:  envs.GetIntWithDefault("VIEWER_LOOP_DELAY", 10),
-		DevEnvMockApi:    envs.GetEnvBoolWithDefault("DEVENV_MOCK_API", true),
 	}
 	Workdir = filepath.Dir(filepath.Dir(utils.GetCurrentFolder().ToString()))
 	Dbpath = NewDBPath(Env.ConfiguratorDbname)
+
+	if !Env.DevEnvMockApi {
+		if Env.ScrappyBaseUrl == "" {
+			logus.Log.Panic("DEVENV_MOCK_API=false, Expected SCRAPPY_BASE_URL env var to be defined")
+		}
+		if Env.ScrappyPlayerUrl == "" {
+			logus.Log.Panic("DEVENV_MOCK_API=false, Expected SCRAPPY_PLAYER_URL env var to be defined")
+		}
+	}
 }
 
 var Dbpath types.Dbpath

diff --git a/app/viewer/viewer_test.go b/app/viewer/viewer_test.go
@@ -1,14 +1 @@
 package viewer
-
-import (
-	"testing"
-
-	"github.com/darklab8/fl-darkbot/app/settings"
-)
-
-func TestDebugPerformance(t *testing.T) {
-	if !settings.Env.IsDevEnv {
-		return
-	}
-
-}