From c9e41292163fa8a8ff1ab4aedb04ae5c4d0f8fa1 Mon Sep 17 00:00:00 2001
From: lifeng68 <lifeng68@huawei.com>
Date: Mon, 22 Jun 2020 09:00:38 +0800
Subject: [PATCH] refact: move log gather to log directory

Signed-off-by: lifeng68 <lifeng68@huawei.com>
---
 src/daemon/CMakeLists.txt                            |  3 +++
 src/daemon/log/CMakeLists.txt                        | 12 ++++++++++++
 .../{callback/container_cb => log}/log_gather.c      |  0
 .../{callback/container_cb => log}/log_gather.h      |  0
 4 files changed, 15 insertions(+)
 create mode 100644 src/daemon/log/CMakeLists.txt
 rename src/daemon/{callback/container_cb => log}/log_gather.c (100%)
 rename src/daemon/{callback/container_cb => log}/log_gather.h (100%)

diff --git a/src/daemon/CMakeLists.txt b/src/daemon/CMakeLists.txt
index 0590eb2..47b57f5 100644
--- a/src/daemon/CMakeLists.txt
+++ b/src/daemon/CMakeLists.txt
@@ -9,6 +9,7 @@ add_subdirectory(callback)
 add_subdirectory(spec)
 add_subdirectory(container)
 add_subdirectory(connect)
+add_subdirectory(log)
 
 set(local_daemon_srcs
     ${daemon_top_srcs}
@@ -20,6 +21,7 @@ set(local_daemon_srcs
     ${SPEC_SRCS}
     ${MANAGER_SRCS}
     ${SERVER_CONNECT_SRCS}
+    ${LOG_GATHER_SRCS}
     )
 
 set(local_daemon_incs
@@ -32,6 +34,7 @@ set(local_daemon_incs
     ${SPEC_INCS}
     ${MANAGER_INCS}
     ${SERVER_CONNECT_INCS}
+    ${LOG_GATHER_INCS}
     )
 
 if (GRPC_CONNECTOR)
diff --git a/src/daemon/log/CMakeLists.txt b/src/daemon/log/CMakeLists.txt
new file mode 100644
index 0000000..2b8574d
--- /dev/null
+++ b/src/daemon/log/CMakeLists.txt
@@ -0,0 +1,12 @@
+# get current directory sources files
+aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR} local_log_gather_srcs)
+
+set(LOG_GATHER_SRCS
+    	${local_log_gather_srcs}
+	PARENT_SCOPE
+	)
+
+set(LOG_GATHER_INCS
+	${CMAKE_CURRENT_SOURCE_DIR}
+    	PARENT_SCOPE
+	)
diff --git a/src/daemon/callback/container_cb/log_gather.c b/src/daemon/log/log_gather.c
similarity index 100%
rename from src/daemon/callback/container_cb/log_gather.c
rename to src/daemon/log/log_gather.c
diff --git a/src/daemon/callback/container_cb/log_gather.h b/src/daemon/log/log_gather.h
similarity index 100%
rename from src/daemon/callback/container_cb/log_gather.h
rename to src/daemon/log/log_gather.h
-- 
GitLab