SILKit-1644: Clean ILoggerInternal interface

vectorgrp · Dec 10, 2024 · fa6070a · fa6070a
1 parent 3a517c3
commit fa6070a
Show file tree

Hide file tree

Showing 58 changed files with 378 additions and 298 deletions.
diff --git a/SilKit/source/core/participant/Participant_impl.hpp b/SilKit/source/core/participant/Participant_impl.hpp
@@ -41,7 +41,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
 #include "SystemMonitor.hpp"
 #include "LogMsgSender.hpp"
 #include "LogMsgReceiver.hpp"
-#include "ILoggerInternal.hpp"
+#include "LoggerMessage.hpp"
 #include "StructuredLoggingKeys.hpp"
 #include "TimeProvider.hpp"
 #include "TimeSyncService.hpp"
@@ -70,7 +70,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
 #include "Assert.hpp"
 #include "ExecutionEnvironment.hpp"
 
-#include "ILoggerInternal.hpp"
 
 
 namespace SilKit {

diff --git a/SilKit/source/core/requests/procs/ParticipantReplies.cpp b/SilKit/source/core/requests/procs/ParticipantReplies.cpp
@@ -22,7 +22,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
 #include "ParticipantReplies.hpp"
 
 #include "silkit/participant/exception.hpp"
-#include "ILoggerInternal.hpp"
+#include "LoggerMessage.hpp"
 
 namespace SilKit {
 namespace Core {

diff --git a/SilKit/source/core/vasio/ConnectKnownParticipants.cpp b/SilKit/source/core/vasio/ConnectKnownParticipants.cpp
@@ -22,7 +22,7 @@
 
 #include "ConnectKnownParticipants.hpp"
 
-#include "ILoggerInternal.hpp"
+#include "LoggerMessage.hpp"
 #include "VAsioConnection.hpp"
 #include "VAsioPeer.hpp"
 #include "util/TracingMacros.hpp"

diff --git a/SilKit/source/core/vasio/ConnectPeer.hpp b/SilKit/source/core/vasio/ConnectPeer.hpp
@@ -26,7 +26,7 @@
 
 #include "IIoContext.hpp"
 
-#include "ILoggerInternal.hpp"
+#include "LoggerMessage.hpp"
 
 #include <chrono>
 #include <functional>

diff --git a/SilKit/source/core/vasio/SilKitLink.hpp b/SilKit/source/core/vasio/SilKitLink.hpp
@@ -21,7 +21,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
 
 #pragma once
 
-#include "ILoggerInternal.hpp"
+#include "LoggerMessage.hpp"
 
 #include "VAsioTransmitter.hpp"
 #include "traits/SilKitMsgTraits.hpp"

diff --git a/SilKit/source/core/vasio/Test_VAsioConnection.cpp b/SilKit/source/core/vasio/Test_VAsioConnection.cpp
@@ -55,7 +55,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
 #include "SerializedMessage.hpp"
 #include "TimeProvider.hpp"
 
-#include "ILoggerInternal.hpp"
+#include "LoggerMessage.hpp"
 
 #include <chrono>
 

diff --git a/SilKit/source/core/vasio/VAsioConnection.cpp b/SilKit/source/core/vasio/VAsioConnection.cpp
@@ -32,7 +32,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
 #include <cctype>
 #include <map>
 
-#include "ILoggerInternal.hpp"
+#include "LoggerMessage.hpp"
+
 #include "VAsioConstants.hpp"
 #include "VAsioPeer.hpp"
 #include "VAsioProxyPeer.hpp"

diff --git a/SilKit/source/core/vasio/VAsioConnection.hpp b/SilKit/source/core/vasio/VAsioConnection.hpp
@@ -57,7 +57,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
 #include "ProtocolVersion.hpp"
 #include "SerializedMessage.hpp"
 #include "Assert.hpp"
-#include "ILoggerInternal.hpp"
+#include "LoggerMessage.hpp"
 #include "VAsioCapabilities.hpp"
 #include "WireLinMessages.hpp"
 #include "Uri.hpp"

diff --git a/SilKit/source/core/vasio/VAsioPeer.cpp b/SilKit/source/core/vasio/VAsioPeer.cpp
@@ -25,7 +25,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
 #include <sstream>
 #include <thread>
 
-#include "ILoggerInternal.hpp"
+#include "LoggerMessage.hpp"
 #include "VAsioMsgKind.hpp"
 #include "VAsioConnection.hpp"
 #include "Uri.hpp"

diff --git a/SilKit/source/core/vasio/VAsioReceiver.hpp b/SilKit/source/core/vasio/VAsioReceiver.hpp
@@ -28,7 +28,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
 #include "MessageTracing.hpp"
 #include "IServiceEndpoint.hpp"
 #include "SerializedMessage.hpp"
-#include "ILoggerInternal.hpp"
+#include "LoggerMessage.hpp"
 
 namespace SilKit {
 namespace Core {

diff --git a/SilKit/source/core/vasio/VAsioRegistry.cpp b/SilKit/source/core/vasio/VAsioRegistry.cpp
@@ -23,7 +23,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
 
 #include "Logger.hpp"
 #include "Uri.hpp"
-#include "ILoggerInternal.hpp"
+#include "LoggerMessage.hpp"
 #include "Optional.hpp"
 #include "TransformAcceptorUris.hpp"
 #include "VAsioConstants.hpp"

diff --git a/SilKit/source/core/vasio/io/IIoContext.hpp b/SilKit/source/core/vasio/io/IIoContext.hpp
@@ -9,7 +9,7 @@
 #include "IConnector.hpp"
 #include "ITimer.hpp"
 
-#include "ILoggerInternal.hpp"
+#include "LoggerMessage.hpp"
 
 #include <functional>
 #include <memory>

diff --git a/SilKit/source/core/vasio/io/MakeAsioIoContext.hpp b/SilKit/source/core/vasio/io/MakeAsioIoContext.hpp
@@ -8,7 +8,7 @@
 #include "IIoContext.hpp"
 #include "AsioSocketOptions.hpp"
 
-#include "ILoggerInternal.hpp"
+#include "LoggerMessage.hpp"
 
 #include <memory>
 

diff --git a/SilKit/source/core/vasio/io/impl/AsioAcceptor.hpp b/SilKit/source/core/vasio/io/impl/AsioAcceptor.hpp
@@ -17,7 +17,7 @@
 #include "util/Exceptions.hpp"
 #include "util/TracingMacros.hpp"
 
-#include "ILoggerInternal.hpp"
+#include "LoggerMessage.hpp"
 
 #include <memory>
 

diff --git a/SilKit/source/core/vasio/io/impl/AsioConnector.hpp b/SilKit/source/core/vasio/io/impl/AsioConnector.hpp
@@ -17,7 +17,7 @@
 #include "util/Exceptions.hpp"
 #include "util/TracingMacros.hpp"
 
-#include "ILoggerInternal.hpp"
+#include "LoggerMessage.hpp"
 
 #include <memory>
 #include <mutex>

diff --git a/SilKit/source/core/vasio/io/impl/AsioGenericRawByteStream.hpp b/SilKit/source/core/vasio/io/impl/AsioGenericRawByteStream.hpp
@@ -10,7 +10,7 @@
 #include "AsioSocketOptions.hpp"
 #include "util/Atomic.hpp"
 
-#include "ILoggerInternal.hpp"
+#include "LoggerMessage.hpp"
 
 #include <memory>
 #include <mutex>

diff --git a/SilKit/source/core/vasio/io/impl/AsioIoContext.hpp b/SilKit/source/core/vasio/io/impl/AsioIoContext.hpp
@@ -9,7 +9,7 @@
 
 #include "MakeAsioIoContext.hpp"
 
-#include "ILoggerInternal.hpp"
+#include "LoggerMessage.hpp"
 
 #include "asio.hpp"
 

diff --git a/SilKit/source/core/vasio/io/impl/SetAsioSocketOptions.cpp b/SilKit/source/core/vasio/io/impl/SetAsioSocketOptions.cpp
@@ -4,7 +4,7 @@
 
 #include "SetAsioSocketOptions.hpp"
 
-#include "ILoggerInternal.hpp"
+#include "LoggerMessage.hpp"
 
 
 namespace {

diff --git a/SilKit/source/core/vasio/io/util/TracingMacros.hpp b/SilKit/source/core/vasio/io/util/TracingMacros.hpp
@@ -5,7 +5,7 @@
 #pragma once
 
 
-#include "ILoggerInternal.hpp"
+#include "LoggerMessage.hpp"
 
 #include <algorithm>
 #include <string>

diff --git a/SilKit/source/dashboard/Client/DashboardSystemServiceClient.cpp b/SilKit/source/dashboard/Client/DashboardSystemServiceClient.cpp
@@ -21,7 +21,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
 
 #include "DashboardSystemServiceClient.hpp"
 
-#include "ILoggerInternal.hpp"
+#include "LoggerMessage.hpp"
 
 #include OATPP_CODEGEN_BEGIN(ApiClient)
 

diff --git a/SilKit/source/dashboard/DashboardInstance.hpp b/SilKit/source/dashboard/DashboardInstance.hpp
@@ -7,7 +7,7 @@
 #include "IDashboardInstance.hpp"
 #include "VAsioRegistry.hpp"
 
-#include "ILoggerInternal.hpp"
+#include "LoggerMessage.hpp"
 
 #include "silkit/config/IParticipantConfiguration.hpp"
 

diff --git a/SilKit/source/dashboard/DashboardParticipant.cpp b/SilKit/source/dashboard/DashboardParticipant.cpp
@@ -23,7 +23,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
 
 #include "silkit/SilKit.hpp"
 #include "silkit/config/IParticipantConfiguration.hpp"
-#include "ILoggerInternal.hpp"
+#include "LoggerMessage.hpp"
 #include "IParticipantInternal.hpp"
 #include "IServiceDiscovery.hpp"
 

diff --git a/SilKit/source/dashboard/Service/CachingSilKitEventHandler.cpp b/SilKit/source/dashboard/Service/CachingSilKitEventHandler.cpp
@@ -23,7 +23,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
 
 #include <chrono>
 
-#include "ILoggerInternal.hpp"
+#include "LoggerMessage.hpp"
 #include "SetThreadName.hpp"
 
 namespace SilKit {

diff --git a/SilKit/source/dashboard/Service/SilKitEventHandler.cpp b/SilKit/source/dashboard/Service/SilKitEventHandler.cpp
@@ -21,7 +21,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
 
 #include "SilKitEventHandler.hpp"
 
-#include "ILoggerInternal.hpp"
+#include "LoggerMessage.hpp"
 #include "silkit/services/orchestration/string_utils.hpp"
 #include "silkit/SilKit.hpp"
 #include "Uri.hpp"

diff --git a/SilKit/source/experimental/netsim/NetworkSimulatorInternal.cpp b/SilKit/source/experimental/netsim/NetworkSimulatorInternal.cpp
@@ -8,7 +8,7 @@
 #include "NetworkSimulatorDatatypesInternal.hpp"
 #include "silkit/experimental/netsim/string_utils.hpp"
 
-#include "ILoggerInternal.hpp"
+#include "LoggerMessage.hpp"
 #include "procs/IParticipantReplies.hpp"
 
 namespace SilKit {

diff --git a/SilKit/source/experimental/netsim/NetworkSimulatorInternal.hpp b/SilKit/source/experimental/netsim/NetworkSimulatorInternal.hpp
@@ -14,7 +14,7 @@
 
 #include "IParticipantInternal.hpp"
 #include "IServiceDiscovery.hpp"
-#include "ILoggerInternal.hpp"
+#include "LoggerMessage.hpp"
 
 #include "SimulatedNetworkRouter.hpp"
 #include "SimulatedNetworkInternal.hpp"

diff --git a/SilKit/source/experimental/netsim/SimulatedNetworkInternal.hpp b/SilKit/source/experimental/netsim/SimulatedNetworkInternal.hpp
@@ -6,7 +6,7 @@
 
 #include <unordered_map>
 
-#include "ILoggerInternal.hpp"
+#include "LoggerMessage.hpp"
 #include "SimulatedNetworkRouter.hpp"
 #include "silkit/experimental/netsim/all.hpp"
 

diff --git a/SilKit/source/experimental/netsim/SimulatedNetworkRouter.hpp b/SilKit/source/experimental/netsim/SimulatedNetworkRouter.hpp
@@ -18,7 +18,7 @@
 #include "WireFlexrayMessages.hpp"
 #include "WireLinMessages.hpp"
 
-#include "ILoggerInternal.hpp"
+#include "LoggerMessage.hpp"
 
 namespace SilKit {
 namespace Experimental {

diff --git a/SilKit/source/services/can/CanController.hpp b/SilKit/source/services/can/CanController.hpp
@@ -38,7 +38,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
 #include "SimBehavior.hpp"
 
 #include "SynchronizedHandlers.hpp"
-#include "ILoggerInternal.hpp"
+
+#include "LoggerMessage.hpp"
 
 namespace SilKit {
 namespace Services {

diff --git a/SilKit/source/services/ethernet/EthController.hpp b/SilKit/source/services/ethernet/EthController.hpp
@@ -34,7 +34,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
 #include "SimBehavior.hpp"
 
 #include "SynchronizedHandlers.hpp"
-#include "ILoggerInternal.hpp"
+#include "LoggerMessage.hpp"
 
 namespace SilKit {
 namespace Services {

diff --git a/SilKit/source/services/flexray/FlexrayController.cpp b/SilKit/source/services/flexray/FlexrayController.cpp
@@ -24,7 +24,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
 #include "IServiceDiscovery.hpp"
 #include "ServiceDatatypes.hpp"
 
-#include "ILoggerInternal.hpp"
+#include "LoggerMessage.hpp"
 
 namespace SilKit {
 namespace Services {

diff --git a/SilKit/source/services/lin/LinController.cpp b/SilKit/source/services/lin/LinController.cpp
@@ -29,7 +29,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
 #include "ServiceDatatypes.hpp"
 #include "Tracing.hpp"
 
-#include "ILoggerInternal.hpp"
+#include "LoggerMessage.hpp"
 #include "WireLinMessages.hpp"
 
 namespace {

diff --git a/SilKit/source/services/lin/LinController.hpp b/SilKit/source/services/lin/LinController.hpp
@@ -37,7 +37,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
 #include "SimBehavior.hpp"
 #include "SynchronizedHandlers.hpp"
 #include "WireLinMessages.hpp"
-#include "ILoggerInternal.hpp"
+#include "LoggerMessage.hpp"
 
 namespace SilKit {
 namespace Services {

diff --git a/SilKit/source/services/logging/CMakeLists.txt b/SilKit/source/services/logging/CMakeLists.txt
@@ -69,7 +69,8 @@ add_library(O_SilKit_Services_Logging OBJECT
     Logger.cpp
     #string formatting for SIL Kit types
     SilKitFmtFormatters.hpp
-
+    LoggerMessage.hpp
+    LogFunctions.hpp
     LoggingSerdes.hpp
     LoggingSerdes.cpp
     StructuredLoggingKeys.hpp