doryan/BloomPatched
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moved environment defaulting to class scope

Browse Source
This commit is contained in:
Nav
2021-05-24 21:05:17 +01:00
parent ce480a996c
commit 76e5fba383
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Application.cpp
View File

@@ -83,17 +83,16 @@ void Application::startup() {
this->blockAllSignalsOnCurrentThread();
this->signalHandlerThread = std::thread(&SignalHandler::run, std::ref(this->signalHandler));
auto environmentName = this->selectedEnvironmentName.value_or("default");
Logger::info("Selected environment: " + environmentName);
Logger::info("Selected environment: " + this->selectedEnvironmentName);
Logger::debug("Number of environments extracted from config: "
+ std::to_string(this->applicationConfig.environments.size()));
// Validate the selected environment
if (!applicationConfig.environments.contains(environmentName)) {
throw InvalidConfig("Environment (\"" + environmentName + "\") not found in configuration.");
if (!applicationConfig.environments.contains(this->selectedEnvironmentName)) {
throw InvalidConfig("Environment (\"" + this->selectedEnvironmentName + "\") not found in configuration.");
}
this->environmentConfig = applicationConfig.environments.at(environmentName);
this->environmentConfig = applicationConfig.environments.at(this->selectedEnvironmentName);
this->insightConfig = this->environmentConfig.insightConfig.value_or(this->applicationConfig.insightConfig);
if (this->environmentConfig.debugServerConfig.has_value()) {