diff --git a/librepomgr/buildactions/buildactionprivate.h b/librepomgr/buildactions/buildactionprivate.h index 5d9d40c..981e648 100644 --- a/librepomgr/buildactions/buildactionprivate.h +++ b/librepomgr/buildactions/buildactionprivate.h @@ -231,7 +231,7 @@ template void BuildProcessSession::launch(ChildArgs &&.. [session = shared_from_this()](auto &executor) { if (const auto buildAction = session->m_buildAction.lock()) { buildAction->appendOutput( - CppUtilities::EscapeCodes::Phrases::InfoMessage, session->m_displayName, " PID: ", executor.pid, '\n'); + CppUtilities::EscapeCodes::Phrases::InfoMessage, "Launched \"", session->m_displayName, "\", PID: ", executor.pid, '\n'); } }, boost::process::on_exit = diff --git a/librepomgr/serversetup.cpp b/librepomgr/serversetup.cpp index c7a45ac..fcaa0c3 100644 --- a/librepomgr/serversetup.cpp +++ b/librepomgr/serversetup.cpp @@ -52,7 +52,7 @@ ThreadPool::ThreadPool(const char *name, boost::asio::io_context &ioContext, uns for (auto i = threadCount; i > 0; --i) { threads.emplace_back([&ioContext, name] { ioContext.run(); - std::cout << Phrases::SubMessage << name << " terminates" << Phrases::End; + std::cout << argsToString(formattedPhraseString(Phrases::SubMessage), name, " terminates", formattedPhraseString(Phrases::End)); }); } } diff --git a/librepomgr/tests/buildactions.cpp b/librepomgr/tests/buildactions.cpp index a3505f1..2186dc8 100644 --- a/librepomgr/tests/buildactions.cpp +++ b/librepomgr/tests/buildactions.cpp @@ -263,7 +263,7 @@ void BuildActionsTests::testBuildActionProcess() CPPUNIT_ASSERT_EQUAL(5001_st, logLines.size()); CPPUNIT_ASSERT_EQUAL("printing some numbers"s, logLines.front()); CPPUNIT_ASSERT_EQUAL("line 5000"s, logLines.back()); - TESTUTILS_ASSERT_LIKE_FLAGS("PID logged", ".*test PID\\: [0-9]+.*\n.*"s, std::regex::extended, m_buildAction->output); + TESTUTILS_ASSERT_LIKE_FLAGS("PID logged", ".*Launched \"test\", PID\\: [0-9]+.*\n.*"s, std::regex::extended, m_buildAction->output); } /*! diff --git a/librepomgr/webapi/server.cpp b/librepomgr/webapi/server.cpp index 8918737..f10d76e 100644 --- a/librepomgr/webapi/server.cpp +++ b/librepomgr/webapi/server.cpp @@ -119,7 +119,8 @@ void Server::accept() void Server::handleAccepted(boost::system::error_code ec) { if (ec) { - cerr << Phrases::WarningMessage << "Failed to accept new connection: " << ec.message() << Phrases::EndFlush; + cerr << argsToString( + formattedPhraseString(Phrases::WarningMessage), "Failed to accept new connection: ", ec.message(), formattedPhraseString(Phrases::End)); } else { // create session and run it std::make_shared(move(m_socket), m_setup)->receive();