blakeridgway/supercell-wx
1
0
Fork 0
mirror of https://github.com/ciphervance/supercell-wx.git synced 2025-10-30 01:40:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update initialization order to ensure initial log entries make it to log file

Browse source
This commit is contained in:
Dan Paulat 2025-08-22 19:25:01 -05:00
parent dfb00b96df
commit 63e6ba7709
1 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
scwx-qt/source/scwx/qt/main/main.cpp
View file

@ -53,10 +53,19 @@ int main(int argc, char* argv[])
args.push_back(argv[i]); args.push_back(argv[i]);
} }
if (!scwx::util::GetEnvironment("SCWX_TEST").empty())
{
QStandardPaths::setTestModeEnabled(true);
}
// Initialize logger // Initialize logger
auto& logManager = scwx::qt::manager::LogManager::Instance(); auto& logManager = scwx::qt::manager::LogManager::Instance();
logManager.Initialize(); logManager.Initialize();
QCoreApplication::setApplicationName("Supercell Wx");
logManager.InitializeLogFile();
logger_->info("Supercell Wx v{}.{} ({})", logger_->info("Supercell Wx v{}.{} ({})",
scwx::qt::main::kVersionString_, scwx::qt::main::kVersionString_,
scwx::qt::main::kBuildNumber_, scwx::qt::main::kBuildNumber_,
@ -66,7 +75,6 @@ int main(int argc, char* argv[])
QApplication a(argc, argv); QApplication a(argc, argv);
QCoreApplication::setApplicationName("Supercell Wx");
scwx::network::cpr::SetUserAgent( scwx::network::cpr::SetUserAgent(
fmt::format("SupercellWx/{}", scwx::qt::main::kVersionString_)); fmt::format("SupercellWx/{}", scwx::qt::main::kVersionString_));
@ -77,11 +85,6 @@ int main(int argc, char* argv[])
QCoreApplication::installTranslator(&translator); QCoreApplication::installTranslator(&translator);
} }
if (!scwx::util::GetEnvironment("SCWX_TEST").empty())
{
QStandardPaths::setTestModeEnabled(true);
}
// Test to see if scwx was run with high privilege // Test to see if scwx was run with high privilege
scwx::qt::main::PrivilegeChecker privilegeChecker; scwx::qt::main::PrivilegeChecker privilegeChecker;
if (privilegeChecker.pre_settings_check()) if (privilegeChecker.pre_settings_check())
@ -116,7 +119,6 @@ int main(int argc, char* argv[])
Aws::InitAPI(awsSdkOptions); Aws::InitAPI(awsSdkOptions);
// Initialize application // Initialize application
logManager.InitializeLogFile();
scwx::qt::config::RadarSite::Initialize(); scwx::qt::config::RadarSite::Initialize();
scwx::qt::config::CountyDatabase::Initialize(); scwx::qt::config::CountyDatabase::Initialize();
scwx::qt::manager::SettingsManager::Instance().Initialize(); scwx::qt::manager::SettingsManager::Instance().Initialize();