diff --git a/CMakeLists.txt b/CMakeLists.txt index 3eb15f0379761c28baf4781ee60858081f8acf52..b089769b65dbd373e8b4db4fa1ef939a9675cba5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ set(CMAKE_C_STANDARD 11) SET( CPACK_PACKAGE_NAME "${PROJECT_NAME}") SET( CPACK_PACKAGE_VERSION_MAJOR 4) SET( CPACK_PACKAGE_VERSION_MINOR 4) -SET( CPACK_PACKAGE_VERSION_PATCH 48) +SET( CPACK_PACKAGE_VERSION_PATCH 49) # # init CellFrame SDK diff --git a/cellframe-sdk b/cellframe-sdk index c8388a17fefc427324a5b40f641cf7611557670a..7e7c6a77ed894ea7b1b859480ab4df4d9bc3d665 160000 --- a/cellframe-sdk +++ b/cellframe-sdk @@ -1 +1 @@ -Subproject commit c8388a17fefc427324a5b40f641cf7611557670a +Subproject commit 7e7c6a77ed894ea7b1b859480ab4df4d9bc3d665 diff --git a/prod_build b/prod_build index c81076a2a46422e27b6de19bc415a74ad89392d5..65dd08624fa3decbfe7f5751748696a18965b31c 160000 --- a/prod_build +++ b/prod_build @@ -1 +1 @@ -Subproject commit c81076a2a46422e27b6de19bc415a74ad89392d5 +Subproject commit 65dd08624fa3decbfe7f5751748696a18965b31c diff --git a/sources/sig_unix_handler.c b/sources/sig_unix_handler.c index f708aea19da56de598c66e35dec2c467144f1b12..3761910185a1aea84083d5c808e919b9c31870f3 100644 --- a/sources/sig_unix_handler.c +++ b/sources/sig_unix_handler.c @@ -1,17 +1,10 @@ #include <signal.h> #include <stdio.h> #include <string.h> -<<<<<<< HEAD #include <unistd.h> -======= ->>>>>>> 8fd2d78ab61d0255fe17b2f7c193bf57525f9e0d - #include "dap_common.h" #include "dap_events.h" #include "dap_chain_global_db.h" -<<<<<<< HEAD -======= -//#include "dap_chain_plugins.h" #include "dap_chain_node.h" #include "dap_chain_net_srv_xchange.h" #include "dap_chain_net_srv_stake.h" @@ -22,7 +15,6 @@ #include "dap_enc_http.h" #include "dap_http.h" #include "dap_chain_node_dns_server.h" ->>>>>>> 8fd2d78ab61d0255fe17b2f7c193bf57525f9e0d #include "sig_unix_handler.h" #ifdef DAP_MODULES_DYNAMIC #include "dap_modules_dynamic_cdb.h" @@ -42,21 +34,13 @@ static void clear_pid_file() { static void sig_exit_handler(int sig_code) { log_it(L_DEBUG, "Got exit code: %d", sig_code); -<<<<<<< HEAD - - clear_pid_file(); - -//#ifdef DAP_SUPPORT_PYTHON_PLUGINS -// dap_chain_plugins_deinit(); -//#endif -======= clear_pid_file(); #ifdef DAP_SUPPORT_PYTHON_PLUGINS dap_chain_plugins_deinit(); -#endif ->>>>>>> 8fd2d78ab61d0255fe17b2f7c193bf57525f9e0d + #endif + dap_chain_node_mempool_autoproc_deinit(); dap_chain_net_srv_xchange_deinit(); dap_chain_net_srv_stake_deinit();