From c6a850df865d2a8b4562ef9486885cac690e295d Mon Sep 17 00:00:00 2001 From: Volker Christian Date: Sat, 11 Jul 2026 10:35:55 +0200 Subject: [PATCH] Remove duplicated socket TLS log prefixes --- src/core/socket/stream/SocketClient.h | 2 +- src/core/socket/stream/SocketServer.h | 2 +- src/core/socket/stream/tls/SocketAcceptor.hpp | 24 +++++++------------ .../socket/stream/tls/SocketConnection.hpp | 17 ++++++------- .../socket/stream/tls/SocketConnector.hpp | 24 +++++++------------ 5 files changed, 27 insertions(+), 42 deletions(-) diff --git a/src/core/socket/stream/SocketClient.h b/src/core/socket/stream/SocketClient.h index c7282822a..99b54b4a3 100644 --- a/src/core/socket/stream/SocketClient.h +++ b/src/core/socket/stream/SocketClient.h @@ -273,7 +273,7 @@ namespace core::socket::stream { config); } } else { - log.critical("{} required", config->getInstanceName()); + log.critical("required"); } }); diff --git a/src/core/socket/stream/SocketServer.h b/src/core/socket/stream/SocketServer.h index fa469fa52..a79c0efcc 100644 --- a/src/core/socket/stream/SocketServer.h +++ b/src/core/socket/stream/SocketServer.h @@ -240,7 +240,7 @@ namespace core::socket::stream { config); } } else { - log.critical("{} required", config->getInstanceName()); + log.critical("required"); } }); diff --git a/src/core/socket/stream/tls/SocketAcceptor.hpp b/src/core/socket/stream/tls/SocketAcceptor.hpp index d8f9eaa7e..d2b77754e 100644 --- a/src/core/socket/stream/tls/SocketAcceptor.hpp +++ b/src/core/socket/stream/tls/SocketAcceptor.hpp @@ -75,25 +75,21 @@ namespace core::socket::stream::tls { } }, [socketContextFactory, onConnected](SocketConnection* socketConnection) { // on Connected - static_cast(socketConnection) - ->log() - .trace("{} SSL/TLS: Start handshake", socketConnection->getConnectionName()); + static_cast(socketConnection)->log().trace("SSL/TLS: Start handshake"); if (!socketConnection->doSSLHandshake( [socketContextFactory, onConnected, socketConnection, - log = static_cast(socketConnection)->log(), - connectionName = socketConnection->getConnectionName()]() { // onSuccess - log.debug("{} SSL/TLS: Handshake success", connectionName); + log = static_cast(socketConnection)->log()]() { // onSuccess + log.debug("SSL/TLS: Handshake success"); onConnected(socketConnection); socketConnection->setSocketContext(socketContextFactory); }, [socketConnection, - log = static_cast(socketConnection)->log(), - connectionName = socketConnection->getConnectionName()]() { // onTimeout - log.error("{}SSL/TLS: Handshake timed out", connectionName); + log = static_cast(socketConnection)->log()]() { // onTimeout + log.error("SSL/TLS: Handshake timed out"); socketConnection->close(); }, @@ -102,9 +98,7 @@ namespace core::socket::stream::tls { socketConnection->close(); })) { - static_cast(socketConnection) - ->log() - .error("{} SSL/TLS: Handshake failed", socketConnection->getConnectionName()); + static_cast(socketConnection)->log().error("SSL/TLS: Handshake failed"); socketConnection->close(); } @@ -141,17 +135,17 @@ namespace core::socket::stream::tls { template void SocketAcceptor::init() { if (core::eventLoopState() == core::State::RUNNING && !config->getDisabled()) { - this->log().trace("{} SSL/TLS: SSL_CTX creating ...", config->getInstanceName()); + this->log().trace("SSL/TLS: SSL_CTX creating ..."); SSL_CTX* sslCtx = config->getSslCtx(); if (sslCtx != nullptr) { - this->log().debug("{} SSL/TLS: SSL_CTX created", config->getInstanceName()); + this->log().debug("SSL/TLS: SSL_CTX created"); SSL_CTX_set_client_hello_cb(sslCtx, clientHelloCallback, nullptr); Super::init(); } else { - this->log().error("{} SSL/TLS: SSL/TLS creation failed", config->getInstanceName()); + this->log().error("SSL/TLS: SSL/TLS creation failed"); Super::onStatus(Super::config->Local::getSocketAddress(), core::socket::STATE_ERROR); Super::destruct(); diff --git a/src/core/socket/stream/tls/SocketConnection.hpp b/src/core/socket/stream/tls/SocketConnection.hpp index 610a178a8..c757e1610 100644 --- a/src/core/socket/stream/tls/SocketConnection.hpp +++ b/src/core/socket/stream/tls/SocketConnection.hpp @@ -166,10 +166,9 @@ namespace core::socket::stream::tls { SocketWriter::resume(); } if (SSL_get_shutdown(ssl) == (SSL_SENT_SHUTDOWN | SSL_RECEIVED_SHUTDOWN)) { - core::socket::stream::SocketConnection::log().debug("{} SSL/TLS: Passive close_notify received and sent", - Super::getConnectionName()); + core::socket::stream::SocketConnection::log().debug("SSL/TLS: Passive close_notify received and sent"); } else { - core::socket::stream::SocketConnection::log().debug("{} SSL/TLS: Active close_notify sent", Super::getConnectionName()); + core::socket::stream::SocketConnection::log().debug("SSL/TLS: Active close_notify sent"); } }, [this, resumeSocketReader, resumeSocketWriter]() { // onTimeout @@ -179,7 +178,7 @@ namespace core::socket::stream::tls { if (resumeSocketWriter) { SocketWriter::resume(); } - core::socket::stream::SocketConnection::log().error("{} SSL/TLS: Shutdown handshake timed out", Super::getConnectionName()); + core::socket::stream::SocketConnection::log().error("SSL/TLS: Shutdown handshake timed out"); Super::doWriteShutdown([this]() { SocketConnection::close(); }); @@ -203,21 +202,19 @@ namespace core::socket::stream::tls { void SocketConnection::onReadShutdown() { if ((SSL_get_shutdown(ssl) & SSL_RECEIVED_SHUTDOWN) != 0) { if ((SSL_get_shutdown(ssl) & SSL_SENT_SHUTDOWN) != 0) { - core::socket::stream::SocketConnection::log().debug("{} SSL/TLS: Active close_notify sent and received", - Super::getConnectionName()); + core::socket::stream::SocketConnection::log().debug("SSL/TLS: Active close_notify sent and received"); SocketWriter::shutdownInProgress = false; if (closeNotifyIsEOF) { this->onReadError(0); } } else { - core::socket::stream::SocketConnection::log().debug( - "{} SSL/TLS: Passive close_notify received, answering with close_notify", Super::getConnectionName()); + core::socket::stream::SocketConnection::log().debug("SSL/TLS: Passive close_notify received, answering with close_notify"); doSSLShutdown(); } } else { - core::socket::stream::SocketConnection::log().error("{} SSL/TLS: Unexpected EOF error", Super::getConnectionName()); + core::socket::stream::SocketConnection::log().error("SSL/TLS: Unexpected EOF error"); SocketWriter::shutdownInProgress = false; SSL_set_shutdown(ssl, SSL_SENT_SHUTDOWN | SSL_RECEIVED_SHUTDOWN); @@ -227,7 +224,7 @@ namespace core::socket::stream::tls { template void SocketConnection::doWriteShutdown(const std::function& onShutdown) { if ((SSL_get_shutdown(ssl) & SSL_SENT_SHUTDOWN) == 0) { - core::socket::stream::SocketConnection::log().debug("{} SSL/TLS: Active send close_notify", Super::getConnectionName()); + core::socket::stream::SocketConnection::log().debug("SSL/TLS: Active send close_notify"); doSSLShutdown(); } else { diff --git a/src/core/socket/stream/tls/SocketConnector.hpp b/src/core/socket/stream/tls/SocketConnector.hpp index 4e376d649..b2ce2dd63 100644 --- a/src/core/socket/stream/tls/SocketConnector.hpp +++ b/src/core/socket/stream/tls/SocketConnector.hpp @@ -78,25 +78,21 @@ namespace core::socket::stream::tls { } }, [socketContextFactory, onConnected](SocketConnection* socketConnection) { // onConnected - static_cast(socketConnection) - ->log() - .trace("{} SSL/TLS: Start handshake", socketConnection->getConnectionName()); + static_cast(socketConnection)->log().trace("SSL/TLS: Start handshake"); if (!socketConnection->doSSLHandshake( [socketContextFactory, onConnected, socketConnection, - log = static_cast(socketConnection)->log(), - connectionName = socketConnection->getConnectionName()]() { // onSuccess - log.debug("{} SSL/TLS: Handshake success", connectionName); + log = static_cast(socketConnection)->log()]() { // onSuccess + log.debug("SSL/TLS: Handshake success"); onConnected(socketConnection); socketConnection->setSocketContext(socketContextFactory); }, [socketConnection, - log = static_cast(socketConnection)->log(), - connectionName = socketConnection->getConnectionName()]() { // onTimeout - log.error("{} SSL/TLS: Handshake timed out", connectionName); + log = static_cast(socketConnection)->log()]() { // onTimeout + log.error("SSL/TLS: Handshake timed out"); socketConnection->close(); }, @@ -105,9 +101,7 @@ namespace core::socket::stream::tls { socketConnection->close(); })) { - static_cast(socketConnection) - ->log() - .error("{} SSL/TLS: Handshake failed", socketConnection->getConnectionName()); + static_cast(socketConnection)->log().error("SSL/TLS: Handshake failed"); socketConnection->close(); } @@ -144,14 +138,14 @@ namespace core::socket::stream::tls { template void SocketConnector::init() { if (core::eventLoopState() == core::State::RUNNING && !config->getDisabled()) { - this->log().trace("{} SSL/TLS: SSL_CTX creating ...", config->getInstanceName()); + this->log().trace("SSL/TLS: SSL_CTX creating ..."); if (config->getSslCtx() != nullptr) { - this->log().debug("{} SSL/TLS: SSL_CTX created", config->getInstanceName()); + this->log().debug("SSL/TLS: SSL_CTX created"); Super::init(); } else { - this->log().error("{} SSL/TLS: SSL_CTX creation failed", config->getInstanceName()); + this->log().error("SSL/TLS: SSL_CTX creation failed"); Super::onStatus(config->Remote::getSocketAddress(), core::socket::STATE_FATAL); Super::destruct();