smartdevicelink · ShobhitAd · Apr 30, 2021 · Nov 12, 2020 · Nov 13, 2020 · Nov 13, 2020
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -59,6 +59,12 @@ option(USE_GOLD_LD "Use gold linker intead of GNU linker" ON)
 option(USE_CCACHE "Turn on ccache usage" ON)
 option(USE_DISTCC "Turn on distributed build_usage" OFF)
 
+set(LOGGER_NAME "BOOST" CACHE STRING "Logging library to use (BOOST, LOG4CXX)")
+set_property(CACHE LOGGER_NAME PROPERTY STRINGS BOOST LOG4CXX)
+if(LOGGER_NAME STREQUAL "")
+  set(LOGGER_NAME "BOOST")
+endif()
+
 set (EXTENDED_POLICY "PROPRIETARY" CACHE STRING "Policy mode (PROPRIETARY, HTTP or EXTERNAL_PROPRIETARY)")
 set_property(CACHE EXTENDED_POLICY PROPERTY STRINGS PROPRIETARY HTTP EXTERNAL_PROPRIETARY)
 if(EXTENDED_POLICY STREQUAL "")
@@ -186,6 +192,12 @@ get_property(cValue CACHE ENABLE_SECURITY PROPERTY VALUE)
 file(APPEND "${build_config_path}" "//${cHelpString}\n")
 file(APPEND "${build_config_path}" "ENABLE_SECURITY:${cType}=${cValue}\n\n")
 
+get_property(cHelpString CACHE LOGGER_NAME PROPERTY HELPSTRING)
+get_property(cType CACHE LOGGER_NAME PROPERTY TYPE)
+get_property(cValue CACHE LOGGER_NAME PROPERTY VALUE)
+file(APPEND "${build_config_path}" "//${cHelpString}\n")
+file(APPEND "${build_config_path}" "LOGGER_NAME:${cType}=${cValue}\n\n")
+
 get_property(cHelpString CACHE EXTENDED_MEDIA_MODE PROPERTY HELPSTRING)
 get_property(cType CACHE EXTENDED_MEDIA_MODE PROPERTY TYPE)
 get_property(cValue CACHE EXTENDED_MEDIA_MODE PROPERTY VALUE)
@@ -376,6 +388,14 @@ else()
    set(POLICY_MOCK_INCLUDE_PATH ${COMPONENTS_DIR}/include/test/policy/policy_regular/)
 endif()
 
+if(${LOGGER_NAME} STREQUAL "LOG4CXX")
+  add_definitions(-DLOG4CXX_LOGGER)
+  message(STATUS "Selected the apache log4cxx logging library")
+else()
+  add_definitions(-DBOOST_LOGGER)
+  message(STATUS "Selected the boost logging library")
+endif()
+
 # TODO(AK): check current OS here
 add_definitions(-DOS_POSIX)
 
@@ -419,7 +439,8 @@ include_directories(
 add_subdirectory(./src/3rd_party EXCLUDE_FROM_ALL)
 
 find_package(OpenSSL REQUIRED)
-if(ENABLE_LOG)
+if(ENABLE_LOG AND ${LOGGER_NAME} STREQUAL "LOG4CXX")
+  message(STATUS "Including log4cxx")
   include_directories ( ${LOG4CXX_INCLUDE_DIRECTORY} )
 endif()
 

diff --git a/src/3rd_party/CMakeLists.txt b/src/3rd_party/CMakeLists.txt
@@ -47,7 +47,7 @@ if(FORCE_3RD_PARTY)
   endif()
 endif()
 
-if(ENABLE_LOG)
+if(ENABLE_LOG AND ${LOGGER_NAME} STREQUAL "LOG4CXX")
   # --- libexpat
   add_subdirectory(expat-2.1.0)
   set(EXPAT_LIBS_DIRECTORY ${3RD_PARTY_INSTALL_PREFIX_ARCH}/lib PARENT_SCOPE)
@@ -221,7 +221,8 @@ else()
 endif()
 
 set(BOOST_ROOT ${3RD_PARTY_INSTALL_PREFIX})
-find_package(Boost 1.66.0 COMPONENTS system thread date_time filesystem regex) 
+find_package(Boost 1.66.0 COMPONENTS system thread date_time filesystem regex log log_setup)
+
 set(BOOST_LIB_SOURCE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/boost_src)
 set(BOOST_LIBS_DIRECTORY ${3RD_PARTY_INSTALL_PREFIX}/lib)
 set(BOOST_INCLUDE_DIR ${3RD_PARTY_INSTALL_PREFIX}/include PARENT_SCOPE)
@@ -239,9 +240,9 @@ if (NOT ${Boost_FOUND})
     URL_HASH SHA256=da3411ea45622579d419bfda66f45cd0f8c32a181d84adfa936f5688388995cf
     DOWNLOAD_DIR ${BOOST_LIB_SOURCE_DIRECTORY}
     SOURCE_DIR ${BOOST_LIB_SOURCE_DIRECTORY}
-    CONFIGURE_COMMAND ./bootstrap.sh --with-libraries=system,thread,date_time,filesystem,regex --prefix=${3RD_PARTY_INSTALL_PREFIX}
+    CONFIGURE_COMMAND ./bootstrap.sh --with-libraries=system,thread,date_time,filesystem,regex,log --prefix=${3RD_PARTY_INSTALL_PREFIX}
     BUILD_COMMAND ./b2
-    INSTALL_COMMAND ${BOOST_INSTALL_COMMAND} --with-system --with-thread --with-date_time --with-filesystem --with-regex --prefix=${3RD_PARTY_INSTALL_PREFIX} > boost_install.log
+    INSTALL_COMMAND ${BOOST_INSTALL_COMMAND} --with-system --with-thread --with-date_time --with-filesystem --with-regex --with-log --prefix=${3RD_PARTY_INSTALL_PREFIX} > boost_install.log
     INSTALL_DIR ${3RD_PARTY_INSTALL_PREFIX}
     BUILD_IN_SOURCE true
   )

diff --git a/src/appMain/CMakeLists.txt b/src/appMain/CMakeLists.txt
@@ -138,7 +138,7 @@ if (BUILD_USB_SUPPORT)
   endif()
 endif()
 
-if(ENABLE_LOG)
+if(ENABLE_LOG AND ${LOGGER_NAME} STREQUAL "LOG4CXX")
   list(APPEND LIBRARIES log4cxx -L${LOG4CXX_LIBS_DIRECTORY})
   list(APPEND LIBRARIES apr-1 -L${APR_LIBS_DIRECTORY})
   list(APPEND LIBRARIES aprutil-1 -L${APR_UTIL_LIBS_DIRECTORY})
@@ -160,7 +160,13 @@ target_link_libraries(${PROJECT} ${LIBRARIES})
 
 add_dependencies(${PROJECT} Policy)
 file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/build_config.txt DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
-file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/log4cxx.properties DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+if (${LOGGER_NAME} STREQUAL "LOG4CXX")
+  file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/log4cxx.properties DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+endif()
+if (${LOGGER_NAME} STREQUAL "BOOST")
+  file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/boostlogconfig.ini DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+endif()
+
 file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/audio.8bit.wav DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
 file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/test.txt DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
 file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/smartDeviceLink.ini DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
@@ -217,7 +223,7 @@ endif ()
 # Install rules
 install(TARGETS ${PROJECT} DESTINATION bin)
 install(
-  FILES build_config.txt log4cxx.properties audio.8bit.wav test.txt
+  FILES build_config.txt log4cxx.properties boostlogconfig.ini audio.8bit.wav test.txt
     ${CMAKE_CURRENT_BINARY_DIR}/smartDeviceLink.ini
     hmi_capabilities.json sdl_preloaded_pt.json sample_policy_manager.py
     ${CMAKE_SOURCE_DIR}/mycert.pem ${CMAKE_SOURCE_DIR}/mykey.pem

diff --git a/src/appMain/boostlogconfig.ini b/src/appMain/boostlogconfig.ini
@@ -0,0 +1,51 @@
+# Core settings
+[Core]
+DisableLogging=false
+
+# Console Logging
+[Sinks.Console]
+DisableLogging=true
+Destination=Console
+Filter="%Severity% >= debug"
+Format="%Severity% [%TimeStamp%][%Component%] %Message%"
+AutoFlush=true
+Asynchronous=true
+
+# SDL log file
+[Sinks.AllMessages]
+DisableLogging=false
+Destination=TextFile
+FileName=SmartDeviceLinkCore.log
+Append=true
+Format="%Severity% [%TimeStamp%][%ThreadId%][%Component%] %FileName%:%LineNum% %Trace%: %Message%"
+AutoFlush=true
+Asynchronous=true
+
+# Log file for all TransportManager messages
+[Sinks.TransportManager]
+DisableLogging=false
+Destination=TextFile
+FileName=TransportManager.log
+Append=false
+Filter="%Component% = TransportManager"
+Format="%Severity% [%TimeStamp%][%ThreadId%][%Component%] %FileName%:%LineNum% %Trace%: %Message%"
+AutoFlush=true
+Asynchronous=true
+
+# Log file for handling Ford protocol info (include ProtocolHandler, ConnectionHandler, SecurityManager)
+[Sinks.ProtocolFordHandling]
+DisableLogging=false
+Destination=TextFile
+FileName=ProtocolFordHandling.log
+Append=false
+Filter="%Component% = ConnectionHandler or %Component% = HeartBeatMonitor or %Component% = ProtocolHandler or %Component% = SecurityManager"
+Format="%Severity% [%TimeStamp%][%Component%] %Trace%: %Message%"
+AutoFlush=true
+Asynchronous=true
+
+[Sinks.Telnet]
+DisableLogging=true
+Destination=Syslog
+Asynchronous=true
+Format="%Severity% [%TimeStamp%][%ThreadId%][%Component%] %FileName%:%LineNum% %Trace%: %Message%"
+LocalAddress="http://127.0.0.1:6676/"
diff --git a/src/appMain/main.cc b/src/appMain/main.cc
@@ -43,7 +43,15 @@
 
 // ----------------------------------------------------------------------------
 #ifdef ENABLE_LOG
+
+#ifdef LOG4CXX_LOGGER
+#include "utils/appenders_loader.h"
 #include "utils/logger/log4cxxlogger.h"
+
+#else  // LOG4CXX_LOGGER
+#include "utils/logger/boostlogger.h"
+#endif  // LOG4CXX_LOGGER
+
 #include "utils/logger/logger_impl.h"
 #endif  // ENABLE_LOG
 
@@ -53,7 +61,6 @@
 #include "signal_handlers.h"
 
 #include "config_profile/profile.h"
-#include "utils/appenders_loader.h"
 #include "utils/signals.h"
 #include "utils/system.h"
 
@@ -142,17 +149,25 @@ int32_t main(int32_t argc, char** argv) {
   if (profile_instance.logs_enabled()) {
     // Logger initialization
     // Redefine for each paticular logger implementation
+#ifdef LOG4CXX_LOGGER
     auto logger = std::unique_ptr<logger::Log4CXXLogger>(
         new logger::Log4CXXLogger("log4cxx.properties"));
+#else   // LOG4CXX_LOGGER
+    auto logger = std::unique_ptr<logger::BoostLogger>(
+        new logger::BoostLogger("boostlogconfig.ini"));
+#endif  // LOG4CXX_LOGGER
+
     logger_impl->Init(std::move(logger));
   }
 #endif
 
   threads::Thread::SetNameForId(threads::Thread::CurrentId(), "SDLCore");
 
+#ifdef LOG4CXX_LOGGER
   if (!utils::appenders_loader.Loaded()) {
     SDL_LOG_ERROR("Appenders plugin not loaded, file logging disabled");
   }
+#endif  // LOG4CXX_LOGGER
 
   SDL_LOG_INFO("Application started!");
   SDL_LOG_INFO("SDL version: " << profile_instance.sdl_version());

diff --git a/src/components/application_manager/CMakeLists.txt b/src/components/application_manager/CMakeLists.txt
@@ -175,7 +175,7 @@ list(APPEND LIBRARIES
   AMPolicyLibrary
 )
 
-if(ENABLE_LOG)
+if (ENABLE_LOG AND ${LOGGER_NAME} STREQUAL "LOG4CXX")
   list(APPEND LIBRARIES log4cxx -L${LOG4CXX_LIBS_DIRECTORY})
 endif()
 

diff --git a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/CMakeLists.txt b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/CMakeLists.txt
@@ -62,7 +62,7 @@ set(LIBRARIES
   sdl_rpc_plugin_static
 )
 
-if(ENABLE_LOG)
+if (ENABLE_LOG AND ${LOGGER_NAME} STREQUAL "LOG4CXX")
   list(APPEND LIBRARIES log4cxx -L${LOG4CXX_LIBS_DIRECTORY})
 endif()
 

diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/CMakeLists.txt b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/CMakeLists.txt
@@ -59,7 +59,7 @@ set(LIBRARIES
   Utils
 )
 
-if(ENABLE_LOG)
+if (ENABLE_LOG AND ${LOGGER_NAME} STREQUAL "LOG4CXX")
   list(APPEND LIBRARIES log4cxx -L${LOG4CXX_LIBS_DIRECTORY})
 endif()
 

diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/CMakeLists.txt b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/CMakeLists.txt
@@ -63,7 +63,7 @@ set(LIBRARIES
   gmock_main
 )
 
-if(ENABLE_LOG)
+if(ENABLE_LOG AND ${LOGGER_NAME} STREQUAL "LOG4CXX")
   list(APPEND LIBRARIES log4cxx -L${LOG4CXX_LIBS_DIRECTORY})
   list(APPEND LIBRARIES apr-1 -L${APR_LIBS_DIRECTORY})
   list(APPEND LIBRARIES aprutil-1 -L${APR_UTIL_LIBS_DIRECTORY})

diff --git a/...ication_manager/rpc_plugins/rc_rpc_plugin/test/resource_allocation_manager/CMakeLists.txt b/...ication_manager/rpc_plugins/rc_rpc_plugin/test/resource_allocation_manager/CMakeLists.txt
@@ -71,7 +71,7 @@ set(LIBRARIES
   dl
 )
 
-if(ENABLE_LOG)
+if(ENABLE_LOG AND ${LOGGER_NAME} STREQUAL "LOG4CXX")
   list(APPEND LIBRARIES log4cxx -L${LOG4CXX_LIBS_DIRECTORY})
   list(APPEND LIBRARIES apr-1 -L${APR_LIBS_DIRECTORY})
   list(APPEND LIBRARIES aprutil-1 -L${APR_UTIL_LIBS_DIRECTORY})

diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/CMakeLists.txt b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/CMakeLists.txt
@@ -62,7 +62,7 @@ set(LIBRARIES
   jsoncpp
 )
 
-if(ENABLE_LOG)
+if (ENABLE_LOG AND ${LOGGER_NAME} STREQUAL "LOG4CXX")
   list(APPEND LIBRARIES log4cxx -L${LOG4CXX_LIBS_DIRECTORY})
 endif()
 

diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/CMakeLists.txt b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/CMakeLists.txt
@@ -54,7 +54,7 @@ set(LIBRARIES
   connectionHandler
 )
 
-if(ENABLE_LOG)
+if (ENABLE_LOG AND ${LOGGER_NAME} STREQUAL "LOG4CXX")
   list(APPEND LIBRARIES log4cxx -L${LOG4CXX_LIBS_DIRECTORY})
 endif()
 

diff --git a/src/components/application_manager/test/CMakeLists.txt b/src/components/application_manager/test/CMakeLists.txt
@@ -123,7 +123,7 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "QNX")
   list(REMOVE_ITEM LIBRARIES dl)
 endif()
 
-if (ENABLE_LOG)
+if (ENABLE_LOG AND ${LOGGER_NAME} STREQUAL "LOG4CXX")
   list(APPEND LIBRARIES log4cxx -L${LOG4CXX_LIBS_DIRECTORY})
   list(APPEND LIBRARIES apr-1 -L${APR_LIBS_DIRECTORY})
   list(APPEND LIBRARIES aprutil-1 -L${APR_UTIL_LIBS_DIRECTORY})

diff --git a/src/components/application_manager/test/app_launch/CMakeLists.txt b/src/components/application_manager/test/app_launch/CMakeLists.txt
@@ -46,7 +46,7 @@ set(LIBRARIES
     ApplicationManager
 )
 
-  if (ENABLE_LOG)
+  if (ENABLE_LOG AND ${LOGGER_NAME} STREQUAL "LOG4CXX")
     list(APPEND LIBRARIES log4cxx -L${LOG4CXX_LIBS_DIRECTORY})
     list(APPEND LIBRARIES apr-1 -L${APR_LIBS_DIRECTORY})
     list(APPEND LIBRARIES aprutil-1 -L${APR_UTIL_LIBS_DIRECTORY})

diff --git a/src/components/hmi_message_handler/CMakeLists.txt b/src/components/hmi_message_handler/CMakeLists.txt
@@ -74,7 +74,7 @@ endif()
 
 target_link_libraries("HMIMessageHandler" ${LIBRARIES})
 
-if(ENABLE_LOG)
+if (ENABLE_LOG AND ${LOGGER_NAME} STREQUAL "LOG4CXX")
   target_link_libraries("HMIMessageHandler" log4cxx -L${LOG4CXX_LIBS_DIRECTORY})
 endif()
 

diff --git a/src/components/media_manager/CMakeLists.txt b/src/components/media_manager/CMakeLists.txt
@@ -102,7 +102,7 @@ collect_sources(SOURCES "${PATHS}" "${EXCLUDE_PATHS}")
 add_library("MediaManager" ${SOURCES})
 target_link_libraries("MediaManager" ${LIBRARIES})
 
-if(ENABLE_LOG)
+if(ENABLE_LOG AND ${LOGGER_NAME} STREQUAL "LOG4CXX")
   target_link_libraries("MediaManager" log4cxx -L${LOG4CXX_LIBS_DIRECTORY})
 endif()
 

diff --git a/src/components/media_manager/test/CMakeLists.txt b/src/components/media_manager/test/CMakeLists.txt
@@ -69,6 +69,6 @@ endif()
 
 create_test("media_manager_test" "${SOURCES}" "${LIBRARIES}")
 
-if(ENABLE_LOG)
+if(ENABLE_LOG AND ${LOGGER_NAME} STREQUAL "LOG4CXX")
     target_link_libraries("media_manager_test" log4cxx -L${LOG4CXX_LIBS_DIRECTORY})
 endif()
diff --git a/src/components/policy/policy_external/CMakeLists.txt b/src/components/policy/policy_external/CMakeLists.txt
@@ -128,7 +128,7 @@ target_link_libraries(PolicyStatic ${LIBRARIES})
 add_library(Policy SHARED "src/policy_manager_impl.cc")
 target_link_libraries(Policy PolicyStatic)
 
-if (ENABLE_LOG)
+if (ENABLE_LOG AND ${LOGGER_NAME} STREQUAL "LOG4CXX")
   target_link_libraries(Policy log4cxx -L${LOG4CXX_LIBS_DIRECTORY})
 endif()
 

diff --git a/src/components/policy/policy_external/test/boostlogconfig.ini b/src/components/policy/policy_external/test/boostlogconfig.ini
@@ -0,0 +1,46 @@
+# Core settings
+[Core]
+DisableLogging=false
+
+# Console Logging (Only ERROR and FATAL messages are logged to console)
+[Sinks.Console]
+DisableLogging=false
+Destination=Console
+Filter="%Severity% >= error"
+Format="%Severity% [%TimeStamp%][%Component%] %Message%"
+AutoFlush=true
+Asynchronous=true
+
+# SDL log file
+[Sinks.AllMessages]
+DisableLogging=false
+Destination=TextFile
+FileName=SmartDeviceLinkCore.log
+Append=true
+Format="%Severity% [%TimeStamp%][%ThreadId%][%Component%] %FileName%:%LineNum% %Trace%: %Message%"
+AutoFlush=true
+Asynchronous=true
+
+# Log file for all SQLPTRepresentation messages
+[Sinks.SQLPTRepresentation]
+DisableLogging=false
+Destination=TextFile
+FileName="SQLRepresentation_%Y-%m-%d.log"
+RotationTimePoint="00:00:00"
+Append=false
+Filter="%Trace% contains SQLPTRepresentation"
+Format="%Severity% [%TimeStamp%] :%LineNum% %Trace%: %Message%"
+AutoFlush=true
+Asynchronous=true
+
+# Log file for all PolicyManagerImpl messages
+[Sinks.PolicyManagerImpl]
+DisableLogging=false
+Destination=TextFile
+FileName="PolicyManagerImpl_%Y-%m-%d.log"
+RotationTimePoint="00:00:00"
+Append=false
+Filter="%Trace% contains PolicyManagerImpl"
+Format="%Severity% [%TimeStamp%] :%LineNum% %Trace%: %Message%"
+AutoFlush=true
+Asynchronous=true
diff --git a/src/components/policy/policy_regular/CMakeLists.txt b/src/components/policy/policy_regular/CMakeLists.txt
@@ -150,7 +150,7 @@ target_link_libraries(PolicyStatic ${LIBRARIES})
 add_library(Policy SHARED "src/policy_manager_impl.cc")
 target_link_libraries(Policy PolicyStatic)
 
-if(ENABLE_LOG)
+if (ENABLE_LOG AND ${LOGGER_NAME} STREQUAL "LOG4CXX")
   target_link_libraries(Policy log4cxx -L${LOG4CXX_LIBS_DIRECTORY})
 endif()