diff options
| author | Stefan Boberg <[email protected]> | 2021-09-15 13:18:34 +0200 |
|---|---|---|
| committer | Stefan Boberg <[email protected]> | 2021-09-15 13:18:34 +0200 |
| commit | ab95978c10258cab130ef7e6dc3f7cb7a1bf337d (patch) | |
| tree | a6e4ca55890f5b728f69ccf8878af98ba2e31bc9 /zenutil/zenserverprocess.cpp | |
| parent | Added #ifdef condition around Windows-specific exception handling (diff) | |
| parent | Cross-platform zen::GetLastError() (diff) | |
| download | zen-ab95978c10258cab130ef7e6dc3f7cb7a1bf337d.tar.xz zen-ab95978c10258cab130ef7e6dc3f7cb7a1bf337d.zip | |
Merged from main
Diffstat (limited to 'zenutil/zenserverprocess.cpp')
| -rw-r--r-- | zenutil/zenserverprocess.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/zenutil/zenserverprocess.cpp b/zenutil/zenserverprocess.cpp index 093f18f6a..3d8f33559 100644 --- a/zenutil/zenserverprocess.cpp +++ b/zenutil/zenserverprocess.cpp @@ -5,11 +5,11 @@ #include <zencore/except.h> #include <zencore/filesystem.h> #include <zencore/fmtutils.h> +#include <zencore/logging.h> #include <zencore/string.h> #include <atlbase.h> #include <shellapi.h> -#include <spdlog/spdlog.h> #include <source_location> #include <zencore/windows.h> @@ -223,7 +223,7 @@ ZenServerState::Sweep() { if (zen::IsProcessRunning(Entry.Pid) == false) { - spdlog::debug("Sweep - pid {} not running, reclaiming entry (port {})", Entry.Pid, Entry.ListenPort); + ZEN_DEBUG("Sweep - pid {} not running, reclaiming entry (port {})", Entry.Pid, Entry.ListenPort); Entry.Reset(); } @@ -281,7 +281,7 @@ ZenServerEnvironment::Initialize(std::filesystem::path ProgramBaseDir) { m_ProgramBaseDir = ProgramBaseDir; - spdlog::debug("Program base dir is '{}'", ProgramBaseDir); + ZEN_DEBUG("Program base dir is '{}'", ProgramBaseDir); m_IsInitialized = true; } @@ -292,8 +292,8 @@ ZenServerEnvironment::InitializeForTest(std::filesystem::path ProgramBaseDir, st m_ProgramBaseDir = ProgramBaseDir; m_TestBaseDir = TestBaseDir; - spdlog::info("Program base dir is '{}'", ProgramBaseDir); - spdlog::info("Cleaning test base dir '{}'", TestBaseDir); + ZEN_INFO("Program base dir is '{}'", ProgramBaseDir); + ZEN_INFO("Cleaning test base dir '{}'", TestBaseDir); zen::DeleteDirectories(TestBaseDir.c_str()); m_IsTestInstance = true; @@ -310,7 +310,7 @@ ZenServerEnvironment::CreateNewTestDir() std::filesystem::path TestPath = m_TestBaseDir / TestDir.c_str(); - spdlog::info("Creating new test dir @ '{}'", TestPath); + ZEN_INFO("Creating new test dir @ '{}'", TestPath); zen::CreateDirectories(TestPath.c_str()); @@ -354,7 +354,7 @@ ZenServerInstance::Shutdown() { if (m_Terminate) { - spdlog::info("Terminating zenserver process"); + ZEN_INFO("Terminating zenserver process"); m_Process.Terminate(111); } else @@ -419,7 +419,7 @@ ZenServerInstance::SpawnServer(int BasePort) std::filesystem::path CurrentDirectory = std::filesystem::current_path(); - spdlog::debug("Spawning server '{}'", LogId); + ZEN_DEBUG("Spawning server '{}'", LogId); PROCESS_INFORMATION ProcessInfo{}; STARTUPINFO StartupInfo{.cb = sizeof(STARTUPINFO)}; @@ -463,7 +463,7 @@ ZenServerInstance::SpawnServer(int BasePort) { // Try launching elevated process - spdlog::debug("Regular spawn failed - spawning elevated server"); + ZEN_DEBUG("Regular spawn failed - spawning elevated server"); SHELLEXECUTEINFO ShellExecuteInfo; ZeroMemory(&ShellExecuteInfo, sizeof(ShellExecuteInfo)); @@ -486,14 +486,14 @@ ZenServerInstance::SpawnServer(int BasePort) { std::error_code err(WinError, std::system_category()); - spdlog::error("Server spawn failed: {}", err.message()); + ZEN_ERROR("Server spawn failed: {}", err.message()); throw std::system_error(err, "failed to create server process"); } } } - spdlog::debug("Server '{}' spawned OK", LogId); + ZEN_DEBUG("Server '{}' spawned OK", LogId); if (IsTest) { |