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
17
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
3e14e7a8
Commit
3e14e7a8
authored
3 years ago
by
dmitriy.gerasimov
Browse files
Options
Downloads
Plain Diff
Merge branch 'master' of
https://gitlab.demlabs.net/cellframe/cellframe-node
parents
5d65b2d5
43c7d6de
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
.gitlab-ci.yml
+1
-1
1 addition, 1 deletion
.gitlab-ci.yml
cellframe-sdk
+1
-1
1 addition, 1 deletion
cellframe-sdk
python-cellframe
+1
-1
1 addition, 1 deletion
python-cellframe
sources/main.c
+3
-3
3 additions, 3 deletions
sources/main.c
sources/sig_unix_handler.c
+3
-7
3 additions, 7 deletions
sources/sig_unix_handler.c
with
9 additions
and
13 deletions
.gitlab-ci.yml
+
1
−
1
View file @
3e14e7a8
...
@@ -6,7 +6,7 @@ stages:
...
@@ -6,7 +6,7 @@ stages:
variables
:
variables
:
GIT_SUBMODULE_STRATEGY
:
normal
GIT_SUBMODULE_STRATEGY
:
normal
k
el
vin
-node-schedule
:
c
el
lframe
-node-schedule
:
stage
:
build
stage
:
build
tags
:
tags
:
-
cellframe-node
-
cellframe-node
...
...
This diff is collapsed.
Click to expand it.
cellframe-sdk
@
1dc31768
Compare
2f78f737
...
1dc31768
Subproject commit
2f78f7376dfdc007def7607432f0120f7473ea28
Subproject commit
1dc31768d2ff237659245726a97ab5bafc085777
This diff is collapsed.
Click to expand it.
python-cellframe
@
32d89f25
Compare
cab83e93
...
32d89f25
Subproject commit
cab83e93ef3b19e8bf2104549d77f6fa74b2fd3d
Subproject commit
32d89f25b2f29d84fdfa40e62f7555feb33f14d8
This diff is collapsed.
Click to expand it.
sources/main.c
+
3
−
3
View file @
3e14e7a8
...
@@ -500,9 +500,9 @@ int main( int argc, const char **argv )
...
@@ -500,9 +500,9 @@ int main( int argc, const char **argv )
//failure:
//failure:
#ifdef DAP_SUPPORT_PYTHON_PLUGINS
//
#ifdef DAP_SUPPORT_PYTHON_PLUGINS
dap_chain_plugins_deinit
();
//
dap_chain_plugins_deinit();
#endif
//
#endif
dap_dns_server_stop
();
dap_dns_server_stop
();
dap_stream_deinit
();
dap_stream_deinit
();
dap_stream_ctl_deinit
();
dap_stream_ctl_deinit
();
...
...
This diff is collapsed.
Click to expand it.
sources/sig_unix_handler.c
+
3
−
7
View file @
3e14e7a8
#include
<signal.h>
#include
<signal.h>
#include
<stdio.h>
#include
<stdio.h>
#include
<string.h>
#include
<string.h>
#include
<unistd.h>
#include
"dap_common.h"
#include
"dap_common.h"
#include
"dap_events.h"
#include
"dap_events.h"
...
@@ -37,7 +38,7 @@ static void clear_pid_file() {
...
@@ -37,7 +38,7 @@ static void clear_pid_file() {
static
void
sig_exit_handler
(
int
sig_code
)
{
static
void
sig_exit_handler
(
int
sig_code
)
{
log_it
(
L_DEBUG
,
"Got exit code: %d"
,
sig_code
);
log_it
(
L_DEBUG
,
"Got exit code: %d"
,
sig_code
);
clear_pid_file
();
clear_pid_file
();
#ifdef DAP_SUPPORT_PYTHON_PLUGINS
#ifdef DAP_SUPPORT_PYTHON_PLUGINS
...
@@ -57,11 +58,6 @@ static void sig_exit_handler(int sig_code) {
...
@@ -57,11 +58,6 @@ static void sig_exit_handler(int sig_code) {
#ifdef DAP_MODULES_DYNAMIC
#ifdef DAP_MODULES_DYNAMIC
dap_modules_dynamic_close_cdb
();
dap_modules_dynamic_close_cdb
();
#endif
#endif
dap_dns_server_stop
();
dap_server_deinit
();
dap_events_stop_all
();
dap_events_deinit
();
dap_config_close
(
g_config
);
dap_interval_timer_deinit
();
dap_interval_timer_deinit
();
dap_common_deinit
();
dap_common_deinit
();
...
@@ -95,7 +91,7 @@ int sig_unix_handler_deinit() {
...
@@ -95,7 +91,7 @@ int sig_unix_handler_deinit() {
//log_it(L_DEBUG, "Deinit");
//log_it(L_DEBUG, "Deinit");
if
(
s_pid_path
)
if
(
s_pid_path
)
DAP_DELETE
(
(
void
*
)
s_pid_path
);
DAP_DELETE
(
s_pid_path
);
signal
(
SIGTERM
,
SIG_DFL
);
signal
(
SIGTERM
,
SIG_DFL
);
signal
(
SIGINT
,
SIG_DFL
);
signal
(
SIGINT
,
SIG_DFL
);
...
...
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