diff options
Diffstat (limited to 'include/kvm_websocket.hpp')
| -rw-r--r-- | include/kvm_websocket.hpp | 59 |
1 files changed, 29 insertions, 30 deletions
diff --git a/include/kvm_websocket.hpp b/include/kvm_websocket.hpp index 8ea3434832..e3131bb3c2 100644 --- a/include/kvm_websocket.hpp +++ b/include/kvm_websocket.hpp @@ -26,9 +26,9 @@ class KvmSession endpoint, [this, &connIn](const boost::system::error_code& ec) { if (ec) { - BMCWEB_LOG_ERROR - << "conn:" << &conn - << ", Couldn't connect to KVM socket port: " << ec; + BMCWEB_LOG_ERROR( + "conn:{}, Couldn't connect to KVM socket port: {}", + logPtr(&conn), ec); if (ec != boost::asio::error::operation_aborted) { connIn.close("Error in connecting to KVM port"); @@ -44,23 +44,22 @@ class KvmSession { if (data.length() > inputBuffer.capacity()) { - BMCWEB_LOG_ERROR << "conn:" << &conn - << ", Buffer overrun when writing " - << data.length() << " bytes"; + BMCWEB_LOG_ERROR("conn:{}, Buffer overrun when writing {} bytes", + logPtr(&conn), data.length()); conn.close("Buffer overrun"); return; } - BMCWEB_LOG_DEBUG << "conn:" << &conn << ", Read " << data.size() - << " bytes from websocket"; + BMCWEB_LOG_DEBUG("conn:{}, Read {} bytes from websocket", logPtr(&conn), + data.size()); boost::asio::buffer_copy(inputBuffer.prepare(data.size()), boost::asio::buffer(data)); - BMCWEB_LOG_DEBUG << "conn:" << &conn << ", Committing " << data.size() - << " bytes from websocket"; + BMCWEB_LOG_DEBUG("conn:{}, Committing {} bytes from websocket", + logPtr(&conn), data.size()); inputBuffer.commit(data.size()); - BMCWEB_LOG_DEBUG << "conn:" << &conn << ", inputbuffer size " - << inputBuffer.size(); + BMCWEB_LOG_DEBUG("conn:{}, inputbuffer size {}", logPtr(&conn), + inputBuffer.size()); doWrite(); } @@ -68,18 +67,18 @@ class KvmSession void doRead() { std::size_t bytes = outputBuffer.capacity() - outputBuffer.size(); - BMCWEB_LOG_DEBUG << "conn:" << &conn << ", Reading " << bytes - << " from kvm socket"; + BMCWEB_LOG_DEBUG("conn:{}, Reading {} from kvm socket", logPtr(&conn), + bytes); hostSocket.async_read_some( outputBuffer.prepare(outputBuffer.capacity() - outputBuffer.size()), [this](const boost::system::error_code& ec, std::size_t bytesRead) { - BMCWEB_LOG_DEBUG << "conn:" << &conn << ", read done. Read " - << bytesRead << " bytes"; + BMCWEB_LOG_DEBUG("conn:{}, read done. Read {} bytes", + logPtr(&conn), bytesRead); if (ec) { - BMCWEB_LOG_ERROR - << "conn:" << &conn - << ", Couldn't read from KVM socket port: " << ec; + BMCWEB_LOG_ERROR( + "conn:{}, Couldn't read from KVM socket port: {}", + logPtr(&conn), ec); if (ec != boost::asio::error::operation_aborted) { conn.close("Error in connecting to KVM port"); @@ -91,8 +90,8 @@ class KvmSession std::string_view payload( static_cast<const char*>(outputBuffer.data().data()), bytesRead); - BMCWEB_LOG_DEBUG << "conn:" << &conn << ", Sending payload size " - << payload.size(); + BMCWEB_LOG_DEBUG("conn:{}, Sending payload size {}", logPtr(&conn), + payload.size()); conn.sendBinary(payload); outputBuffer.consume(bytesRead); @@ -104,14 +103,14 @@ class KvmSession { if (doingWrite) { - BMCWEB_LOG_DEBUG << "conn:" << &conn - << ", Already writing. Bailing out"; + BMCWEB_LOG_DEBUG("conn:{}, Already writing. Bailing out", + logPtr(&conn)); return; } if (inputBuffer.size() == 0) { - BMCWEB_LOG_DEBUG << "conn:" << &conn - << ", inputBuffer empty. Bailing out"; + BMCWEB_LOG_DEBUG("conn:{}, inputBuffer empty. Bailing out", + logPtr(&conn)); return; } @@ -119,8 +118,8 @@ class KvmSession hostSocket.async_write_some(inputBuffer.data(), [this](const boost::system::error_code& ec, std::size_t bytesWritten) { - BMCWEB_LOG_DEBUG << "conn:" << &conn << ", Wrote " << bytesWritten - << "bytes"; + BMCWEB_LOG_DEBUG("conn:{}, Wrote {}bytes", logPtr(&conn), + bytesWritten); doingWrite = false; inputBuffer.consume(bytesWritten); @@ -131,8 +130,8 @@ class KvmSession } if (ec) { - BMCWEB_LOG_ERROR << "conn:" << &conn - << ", Error in KVM socket write " << ec; + BMCWEB_LOG_ERROR("conn:{}, Error in KVM socket write {}", + logPtr(&conn), ec); if (ec != boost::asio::error::operation_aborted) { conn.close("Error in reading to host port"); @@ -164,7 +163,7 @@ inline void requestRoutes(App& app) .privileges({{"ConfigureComponents", "ConfigureManager"}}) .websocket() .onopen([](crow::websocket::Connection& conn) { - BMCWEB_LOG_DEBUG << "Connection " << &conn << " opened"; + BMCWEB_LOG_DEBUG("Connection {} opened", logPtr(&conn)); if (sessions.size() == maxSessions) { |