Remove log_manager as a separate component.

Log_manager files are now in server/core and the log manager test
files in server/core/test. The directory log_manager is removed.

CMakeLists.txt

@@ -164,7 +164,6 @@ set(CMAKE_CXX_FLAGS_RELEASE "")
 set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-ggdb")
 
 include_directories(utils)
-include_directories(log_manager)
 include_directories(server/include)
 include_directories(server/include/maxscale)
 include_directories(server/inih)

log_manager/CMakeLists.txt

@@ -1,12 +0,0 @@
-# NOTE: This is currently not used. log_manager.cc is built directly into maxscale-common.
-#       To be removed completely.
-if(LOG_DEBUG)
-  add_definitions(-DSS_LOG_DEBUG)
-endif()
-add_library(log_manager SHARED log_manager.cc)
-target_link_libraries(log_manager pthread aio stdc++)
-set_target_properties(log_manager PROPERTIES VERSION "1.0.0")
-install(TARGETS log_manager DESTINATION ${MAXSCALE_LIBDIR})
-if(BUILD_TESTS)
-  add_subdirectory(test)
-endif()

log_manager/test/.gitignore

@@ -1,2 +0,0 @@
-# binaries generated here 
-testlog

log_manager/test/CMakeLists.txt

@@ -1,6 +0,0 @@
-add_executable(testlog testlog.c)
-add_executable(testorder testorder.c ../../server/core/random_jkiss.c)
-target_link_libraries(testlog pthread log_manager utils fullcore)
-target_link_libraries(testorder pthread log_manager utils fullcore)
-add_test(NAME Internal-TestLogOrder COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/logorder.sh  200 0 1000 ${CMAKE_CURRENT_BINARY_DIR}/logorder.log)
-add_test(Internal-TestLog testlog)

server/core/CMakeLists.txt

@@ -1,4 +1,4 @@
-add_library(maxscale-common SHARED adminusers.c atomic.c buffer.c config.c dbusers.c dcb.c filter.c externcmd.c gwbitmask.c gwdirs.c gw_utils.c hashtable.c hint.c housekeeper.c load_utils.c maxscale_pcre2.c memlog.c modutil.c monitor.c query_classifier.c poll.c random_jkiss.c resultset.c secrets.c server.c service.c session.c spinlock.c thread.c users.c utils.c ${CMAKE_SOURCE_DIR}/log_manager/log_manager.cc ${CMAKE_SOURCE_DIR}/utils/skygw_utils.cc statistics.c)
+add_library(maxscale-common SHARED adminusers.c atomic.c buffer.c config.c dbusers.c dcb.c filter.c externcmd.c gwbitmask.c gwdirs.c gw_utils.c hashtable.c hint.c housekeeper.c load_utils.c log_manager.cc maxscale_pcre2.c memlog.c modutil.c monitor.c query_classifier.c poll.c random_jkiss.c resultset.c secrets.c server.c service.c session.c spinlock.c thread.c users.c utils.c ${CMAKE_SOURCE_DIR}/utils/skygw_utils.cc statistics.c)
 
 target_link_libraries(maxscale-common ${MARIADB_CONNECTOR_LIBRARIES} ${LZMA_LINK_FLAGS} ${PCRE2_LIBRARIES} ${CURL_LIBRARIES} ssl aio pthread crypt dl crypto inih z rt m stdc++)
 

server/core/test/CMakeLists.txt

@@ -5,6 +5,8 @@ add_executable(test_dcb testdcb.c)
 add_executable(test_filter testfilter.c)
 add_executable(test_hash testhash.c)
 add_executable(test_hint testhint.c)
+add_executable(test_log testlog.c)
+add_executable(test_logorder testlogorder.c)
 add_executable(test_modutil testmodutil.c)
 add_executable(test_mysql_users test_mysql_users.c)
 add_executable(test_poll testpoll.c)
@@ -21,6 +23,8 @@ target_link_libraries(test_dcb maxscale-common)
 target_link_libraries(test_filter maxscale-common)
 target_link_libraries(test_hash maxscale-common)
 target_link_libraries(test_hint maxscale-common)
+target_link_libraries(test_log maxscale-common)
+target_link_libraries(test_logorder maxscale-common)
 target_link_libraries(test_modutil maxscale-common)
 target_link_libraries(test_mysql_users MySQLClient maxscale-common)
 target_link_libraries(test_poll maxscale-common)
@@ -37,6 +41,8 @@ add_test(Internal-TestDCB test_dcb)
 add_test(Internal-TestFilter test_filter)
 add_test(Internal-TestHash test_hash)
 add_test(Internal-TestHint test_hint)
+add_test(Internal-TestLog test_log)
+add_test(NAME Internal-TestLogOrder COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/logorder.sh  200 0 1000 ${CMAKE_CURRENT_BINARY_DIR}/logorder.log)
 add_test(Internal-TestMaxScalePCRE2 testmaxscalepcre2)
 add_test(Internal-TestMemlog testmemlog)
 add_test(Internal-TestModutil test_modutil)