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
92084a09
Commit
92084a09
authored
4 years ago
by
dmitriy.gerasimov
Browse files
Options
Downloads
Plain Diff
Merge branch 'features-4402' into 'release-4.0'
features-4402 See merge request
!169
parents
535e1124
f05b8477
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!169
features-4402
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
CMakeLists.txt
+2
-1
2 additions, 1 deletion
CMakeLists.txt
cellframe-sdk
+1
-1
1 addition, 1 deletion
cellframe-sdk
python-cellframe
+1
-1
1 addition, 1 deletion
python-cellframe
sources/main.c
+3
-5
3 additions, 5 deletions
sources/main.c
with
7 additions
and
8 deletions
CMakeLists.txt
+
2
−
1
View file @
92084a09
...
...
@@ -8,7 +8,8 @@ set(CMAKE_C_STANDARD 11)
SET
(
CPACK_PACKAGE_NAME
"
${
PROJECT_NAME
}
"
)
SET
(
CPACK_PACKAGE_VERSION_MAJOR 4
)
SET
(
CPACK_PACKAGE_VERSION_MINOR 0
)
SET
(
CPACK_PACKAGE_VERSION_PATCH 19
)
SET
(
CPACK_PACKAGE_VERSION_PATCH 20
)
# init CellFrame SDK
add_definitions
(
"-DDAP_VERSION=
\"
${
CPACK_PACKAGE_VERSION_MAJOR
}
\"
"
)
...
...
This diff is collapsed.
Click to expand it.
cellframe-sdk
@
f9a003f2
Compare
e6ace687
...
f9a003f2
Subproject commit
e6ace6873dc568d57b7f1eacc0695555f80ff65e
Subproject commit
f9a003f2191d47df3e72b0cfaaac8669d5975d35
This diff is collapsed.
Click to expand it.
python-cellframe
@
8409f940
Compare
ac3fd0ec
...
8409f940
Subproject commit
ac3fd0eccada33cef23da71d861e8d112fb531de
Subproject commit
8409f94041028ab58b859b112894d9f37bcb9682
This diff is collapsed.
Click to expand it.
sources/main.c
+
3
−
5
View file @
92084a09
...
...
@@ -383,10 +383,8 @@ int main( int argc, const char **argv )
}
#endif
if
(
dap_chain_node_mempool_init
())
{
log_it
(
L_CRITICAL
,
"Can't init automatic mempool processing"
);
return
-
13
;
}
log_it
(
L_INFO
,
"Automatic mempool processing %s"
,
dap_chain_node_mempool_autoproc_init
()
?
"enabled"
:
"disabled"
);
save_process_pid_in_file
(
s_pid_file_path
);
...
...
@@ -494,7 +492,7 @@ int main( int argc, const char **argv )
dap_http_deinit
();
if
(
bServerEnabled
)
dap_server_deinit
();
dap_enc_ks_deinit
();
dap_chain_node_mempool_deinit
();
dap_chain_node_mempool_
autoproc_
deinit
();
dap_chain_net_srv_xchange_deinit
();
dap_chain_net_srv_stake_deinit
();
...
...
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