Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
celllframe-node
Manage
Activity
Members
Labels
Plan
Issues
5
Issue boards
Milestones
Code
Merge requests
15
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
cellframe
celllframe-node
Commits
4b86863c
Commit
4b86863c
authored
3 years ago
by
dmitriy.gerasimov
Browse files
Options
Downloads
Plain Diff
Merge branch 'bugs-4854' into 'release-4.4'
bugs-4854 See merge request
!225
parents
ee758451
e3408ac2
No related branches found
No related tags found
2 merge requests
!226
Release 4.4
,
!225
bugs-4854
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
CMakeLists.txt
+1
-1
1 addition, 1 deletion
CMakeLists.txt
cellframe-sdk
+1
-1
1 addition, 1 deletion
cellframe-sdk
sources/main.c
+1
-1
1 addition, 1 deletion
sources/main.c
sources/sig_unix_handler.c
+4
-1
4 additions, 1 deletion
sources/sig_unix_handler.c
with
7 additions
and
4 deletions
CMakeLists.txt
+
1
−
1
View file @
4b86863c
...
@@ -8,7 +8,7 @@ set(CMAKE_C_STANDARD 11)
...
@@ -8,7 +8,7 @@ set(CMAKE_C_STANDARD 11)
SET
(
CPACK_PACKAGE_NAME
"
${
PROJECT_NAME
}
"
)
SET
(
CPACK_PACKAGE_NAME
"
${
PROJECT_NAME
}
"
)
SET
(
CPACK_PACKAGE_VERSION_MAJOR 4
)
SET
(
CPACK_PACKAGE_VERSION_MAJOR 4
)
SET
(
CPACK_PACKAGE_VERSION_MINOR 4
)
SET
(
CPACK_PACKAGE_VERSION_MINOR 4
)
SET
(
CPACK_PACKAGE_VERSION_PATCH 3
1
)
SET
(
CPACK_PACKAGE_VERSION_PATCH 3
2
)
# init CellFrame SDK
# init CellFrame SDK
add_definitions
(
"-DDAP_VERSION=
\"
${
CPACK_PACKAGE_VERSION_MAJOR
}
-
${
CPACK_PACKAGE_VERSION_MINOR
}
.
${
CPACK_PACKAGE_VERSION_PATCH
}
\"
"
)
add_definitions
(
"-DDAP_VERSION=
\"
${
CPACK_PACKAGE_VERSION_MAJOR
}
-
${
CPACK_PACKAGE_VERSION_MINOR
}
.
${
CPACK_PACKAGE_VERSION_PATCH
}
\"
"
)
...
...
This diff is collapsed.
Click to expand it.
cellframe-sdk
@
b2f326f6
Compare
a27db464
...
b2f326f6
Subproject commit
a27db464f08e151be031ff805d030bbf969fc26d
Subproject commit
b2f326f6545836621bef1ecb425e6cfb13be721f
This diff is collapsed.
Click to expand it.
sources/main.c
+
1
−
1
View file @
4b86863c
...
@@ -514,13 +514,13 @@ int main( int argc, const char **argv )
...
@@ -514,13 +514,13 @@ int main( int argc, const char **argv )
dap_chain_net_srv_xchange_deinit
();
dap_chain_net_srv_xchange_deinit
();
dap_chain_net_srv_stake_deinit
();
dap_chain_net_srv_stake_deinit
();
dap_chain_net_deinit
();
dap_chain_net_deinit
();
#ifdef DAP_MODULES_DYNAMIC
#ifdef DAP_MODULES_DYNAMIC
dap_modules_dynamic_close_cdb
();
dap_modules_dynamic_close_cdb
();
#endif
#endif
dap_chain_global_db_deinit
();
dap_chain_global_db_deinit
();
dap_chain_deinit
();
dap_chain_deinit
();
dap_config_close
(
g_config
);
dap_config_close
(
g_config
);
dap_interval_timer_deinit
();
dap_common_deinit
();
dap_common_deinit
();
return
rc
*
10
;
return
rc
*
10
;
...
...
This diff is collapsed.
Click to expand it.
sources/sig_unix_handler.c
+
4
−
1
View file @
4b86863c
...
@@ -23,6 +23,8 @@
...
@@ -23,6 +23,8 @@
#define LOG_TAG "sig_unix_handler"
#define LOG_TAG "sig_unix_handler"
void
dap_chain_plugins_deinit
();
static
const
char
*
s_pid_path
=
NULL
;
static
const
char
*
s_pid_path
=
NULL
;
static
void
clear_pid_file
()
{
static
void
clear_pid_file
()
{
...
@@ -38,7 +40,7 @@ static void sig_exit_handler(int sig_code) {
...
@@ -38,7 +40,7 @@ static void sig_exit_handler(int sig_code) {
clear_pid_file
();
clear_pid_file
();
#ifdef DAP_SUPPORT_PYTHON_PLUGINS
#ifdef DAP_SUPPORT_PYTHON_PLUGINS
dap_chain_plugins_deinit
();
dap_chain_plugins_deinit
();
#endif
#endif
dap_chain_node_mempool_autoproc_deinit
();
dap_chain_node_mempool_autoproc_deinit
();
...
@@ -60,6 +62,7 @@ static void sig_exit_handler(int sig_code) {
...
@@ -60,6 +62,7 @@ static void sig_exit_handler(int sig_code) {
dap_events_stop_all
();
dap_events_stop_all
();
dap_events_deinit
();
dap_events_deinit
();
dap_config_close
(
g_config
);
dap_config_close
(
g_config
);
dap_interval_timer_deinit
();
dap_common_deinit
();
dap_common_deinit
();
log_it
(
L_NOTICE
,
"Stopped Cellframe Node"
);
log_it
(
L_NOTICE
,
"Stopped Cellframe Node"
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment