From 70c750db39aa4a2d2817e3683ad8d98392723ae1 Mon Sep 17 00:00:00 2001 From: fengzero Date: Thu, 17 Mar 2022 07:49:35 +0000 Subject: [PATCH] move neuron.log to logs/ --- .gitkeep | 0 CMakeLists.txt | 3 ++- package.sh | 2 ++ package/create_neuron_deb.py | 2 ++ plugins/restful/log_handle.c | 2 +- src/main.c | 2 +- 6 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 .gitkeep diff --git a/.gitkeep b/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/CMakeLists.txt b/CMakeLists.txt index 1ac9f15b..b0b24830 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -182,7 +182,8 @@ endif() target_link_libraries(neuron-base vector-static csptr jansson crypto ssl mqttc yaml jwt ${CMAKE_THREAD_LIBS_INIT}) -#copy file for run and unit test +#copy file for run +file(COPY ${CMAKE_SOURCE_DIR}/.gitkeep DESTINATION ${CMAKE_BINARY_DIR}/logs) file(COPY ${CMAKE_SOURCE_DIR}/neuron.yaml DESTINATION ${CMAKE_BINARY_DIR}/config) file(COPY ${CMAKE_SOURCE_DIR}/plugins/modbus/modbus-tcp-plugin.json DESTINATION ${CMAKE_BINARY_DIR}/plugins/schema/) file(COPY ${CMAKE_SOURCE_DIR}/plugins/mqtt/mqtt-plugin.json DESTINATION ${CMAKE_BINARY_DIR}/plugins/schema/) diff --git a/package.sh b/package.sh index eb730047..16cc8311 100755 --- a/package.sh +++ b/package.sh @@ -35,10 +35,12 @@ if [ ! -d $package_name ];then mkdir -p $package_name/persistence mkdir -p $package_name/config mkdir -p $package_name/plugins/schema + mkdir -p $package_name/logs else rm -rf ${package_name}/* fi +cp .gitkeep ${package_name}/logs/ cp default_plugins.json ${package_name}/persistence/plugins.json cp build/libneuron-base.so \ diff --git a/package/create_neuron_deb.py b/package/create_neuron_deb.py index 060d29eb..bd70416b 100755 --- a/package/create_neuron_deb.py +++ b/package/create_neuron_deb.py @@ -12,6 +12,8 @@ rules.append(mkdeb.FileMap("deb/neuron/prerm", "/DEBIAN/", "r", "prerm")) rules.append(mkdeb.FileMap("../build/neuron", "/opt/neuron/", "x")) +rules.append(mkdeb.FileMap("../.gitkeep", "/opt/neuron/logs/")) + rules.append(mkdeb.FileMap("../private.key", "/opt/neuron/config/")) rules.append(mkdeb.FileMap("../public.pem", "/opt/neuron/config/")) rules.append(mkdeb.FileMap("../neuron.yaml", "/opt/neuron/config/")) diff --git a/plugins/restful/log_handle.c b/plugins/restful/log_handle.c index 970d16d4..68a50f17 100644 --- a/plugins/restful/log_handle.c +++ b/plugins/restful/log_handle.c @@ -44,7 +44,7 @@ #include "log_handle.h" #define LOG_TIME_FMT "%Y-%m-%d %H:%M:%S" -#define LOG_FILE "neuron.log" +#define LOG_FILE "./logs/neuron.log" #define LOG_PAGE_SIZE_MIN 200 #define LOG_PAGE_SIZE_MAX 10000 diff --git a/src/main.c b/src/main.c index 32913ed6..8baad3d1 100644 --- a/src/main.c +++ b/src/main.c @@ -57,7 +57,7 @@ static void init() nng_mtx_alloc(&log_mtx); log_set_lock(log_lock, log_mtx); log_set_level(NEU_LOG_DEBUG); - g_logfile = fopen("neuron.log", "a"); + g_logfile = fopen("./logs/neuron.log", "a"); if (g_logfile == NULL) { fprintf(stderr, "Failed to open logfile when"