From ce4276a783c437148400c79a0276ce2df58b4bf8 Mon Sep 17 00:00:00 2001 From: Stefan Boberg Date: Wed, 8 Sep 2021 19:28:59 +0200 Subject: Adding ZenServerInstance::GetBaseUri() --- zenutil/zenserverprocess.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'zenutil/zenserverprocess.cpp') diff --git a/zenutil/zenserverprocess.cpp b/zenutil/zenserverprocess.cpp index 4e45ddfae..8bbae426a 100644 --- a/zenutil/zenserverprocess.cpp +++ b/zenutil/zenserverprocess.cpp @@ -403,6 +403,7 @@ ZenServerInstance::SpawnServer(int BasePort) if (BasePort) { CommandLine << " --port " << BasePort; + m_BasePort = BasePort; } if (!m_TestDir.empty()) @@ -558,3 +559,13 @@ ZenServerInstance::WaitUntilReady(int Timeout) { return m_ReadyEvent.Wait(Timeout); } + +std::string +ZenServerInstance::GetBaseUri() const +{ + ZEN_ASSERT(m_BasePort); + + using namespace fmt::literals; + + return "http://localhost:{}"_format(m_BasePort); +} -- cgit v1.2.3 From 9e9a3a2a0f45f1c0cf05db7dbeab3f536f7a883a Mon Sep 17 00:00:00 2001 From: Stefan Boberg Date: Wed, 8 Sep 2021 21:37:34 +0200 Subject: Log spawned process name --- zenutil/zenserverprocess.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'zenutil/zenserverprocess.cpp') diff --git a/zenutil/zenserverprocess.cpp b/zenutil/zenserverprocess.cpp index 8bbae426a..d0dd0106b 100644 --- a/zenutil/zenserverprocess.cpp +++ b/zenutil/zenserverprocess.cpp @@ -419,7 +419,7 @@ ZenServerInstance::SpawnServer(int BasePort) std::filesystem::path CurrentDirectory = std::filesystem::current_path(); - spdlog::debug("Spawning server"); + spdlog::debug("Spawning server '{}'", LogId); PROCESS_INFORMATION ProcessInfo{}; STARTUPINFO StartupInfo{.cb = sizeof(STARTUPINFO)}; @@ -493,7 +493,7 @@ ZenServerInstance::SpawnServer(int BasePort) } } - spdlog::debug("Server spawned OK"); + spdlog::debug("Server '{}' spawned OK", LogId); if (IsTest) { -- cgit v1.2.3 From 46aa14744ba72873975d288b568fa3b15d196a78 Mon Sep 17 00:00:00 2001 From: Stefan Boberg Date: Thu, 9 Sep 2021 20:46:22 +0200 Subject: clang-format --- zenutil/zenserverprocess.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'zenutil/zenserverprocess.cpp') diff --git a/zenutil/zenserverprocess.cpp b/zenutil/zenserverprocess.cpp index d0dd0106b..093f18f6a 100644 --- a/zenutil/zenserverprocess.cpp +++ b/zenutil/zenserverprocess.cpp @@ -560,7 +560,7 @@ ZenServerInstance::WaitUntilReady(int Timeout) return m_ReadyEvent.Wait(Timeout); } -std::string +std::string ZenServerInstance::GetBaseUri() const { ZEN_ASSERT(m_BasePort); -- cgit v1.2.3