diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 631413c22b5c462a98e3a6fa54890d53ffa4e772..08e7462912f896e71034bd479b4f971f704e0dc2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -212,6 +212,8 @@ amd64:linux.tps: before_script: - /opt/buildtools/prepare_environment.sh amd64-linux - *fill_version_mk + when: manual + script: - ./prod_build/build.sh --target linux release -DBUILD_WITH_TPS_TEST=ON - ./prod_build/pack.sh --target linux release diff --git a/cellframe-sdk b/cellframe-sdk index 17abbf5f2c5c85e61847643983bde90c7486ee4f..8c6912d900ba993a4ed515c7632a770e9893d84e 160000 --- a/cellframe-sdk +++ b/cellframe-sdk @@ -1 +1 @@ -Subproject commit 17abbf5f2c5c85e61847643983bde90c7486ee4f +Subproject commit 8c6912d900ba993a4ed515c7632a770e9893d84e diff --git a/dist/share/configs/cellframe-node.cfg b/dist/share/configs/cellframe-node.cfg index 495c6da0a3b0ed5055c345e1f2a41daa0471d09e..5b1601e21d6ca11486973d9e7ab92efc5bfc9b10 100644 --- a/dist/share/configs/cellframe-node.cfg +++ b/dist/share/configs/cellframe-node.cfg @@ -161,6 +161,8 @@ network_mask=255.255.255.0 # Console interface server [cli-server] enabled=true +# debug_more=false +# debug-cli=false #unix-only #listen-path=[../var/run/node_cli] #listen-address=[127.0.0.1:12345] @@ -180,6 +182,8 @@ ca_folders=[../var/lib/ca,../share/ca] #debug_more=true path=../var/lib/global_db driver= +#debug_more=true +# mdbx_upper_limit_of_db_size=1024 # Plugins [plugins] diff --git a/dist/share/configs/network/raiden.cfg b/dist/share/configs/network/raiden.cfg index db689d80187689185a20f994ac3e2fc7a0fdbcca..dc391c681718ae05c6bf051002999537e8455bd0 100644 --- a/dist/share/configs/network/raiden.cfg +++ b/dist/share/configs/network/raiden.cfg @@ -20,7 +20,7 @@ node-role= #permanent_nodes_hosts=[] # This addresses will have priviledged acceess to some GDB groups authorized_nodes_addrs=[BCA3::B097::DCDC::CB2B, 038E::0C9B::A3E8::C533, CC88::3F68::5313::1577, 72F9::511B::616A::A46F, A2C2::0CD4::38BA::2E8C, A983::7C3F::7FD4::4950, D1E4::F837::F42C::BFEF, B6E5::1B78::847A::F026] -# This hosts wiil be used as bootstrap balancers for first net access +# This hosts will be used as bootstrap balancers for first net access seed_nodes_hosts=[0.root.raiden.cellframe.net:8079, 1.root.raiden.cellframe.net:8079, 2.root.raiden.cellframe.net:8079] #[auth] diff --git a/dist/share/configs/network/riemann.cfg b/dist/share/configs/network/riemann.cfg index bf36b1b079e7358136876ebf59cd48608d51e713..bb83cc77ac8a72f37c92e779bdc0033c0316f7fb 100644 --- a/dist/share/configs/network/riemann.cfg +++ b/dist/share/configs/network/riemann.cfg @@ -21,7 +21,7 @@ node-role= # This addresses will have priviledged acceess to some GDB groups authorized_nodes_addrs=[D420::C2A9::0637::040C,AC33::9A06::AAD8::B288,5DA8::C171::E316::C923,72F9::511B::616A::A46F,A2C2::0CD4::38BA::2E8C,A983::7C3F::7FD4::4950,D1E4::F837::F42C::BFEF] -# This hosts wiil be used as bootstrap balancers for first net access +# This hosts will be used as bootstrap balancers for first net access seed_nodes_hosts=[0.root.riemann.cellframe.net:8079, 1.root.riemann.cellframe.net:8079, 2.root.riemann.cellframe.net:8079] #[auth] diff --git a/dist/share/configs/network/subzero.cfg b/dist/share/configs/network/subzero.cfg index 46b9eaa3b1d62b5a58f1fea02e7dfb0df8c88470..0e91294f6e98c2aebdae17fedd4e85431d17e398 100755 --- a/dist/share/configs/network/subzero.cfg +++ b/dist/share/configs/network/subzero.cfg @@ -18,7 +18,7 @@ node-role= #permanent_nodes_hosts=[] # This addresses will have priviledged acceess to some GDB groups authorized_nodes_addrs=[608C::F7B7::D476::2438, 7497::4FB4::CFA1::9823, 5641::292F::13F5::F039] -# This hosts wiil be used as bootstrap balancers for first net access +# This hosts will be used as bootstrap balancers for first net access seed_nodes_hosts=[0.root.subzero.cellframe.net:8190, 1.root.subzero.cellframe.net:8190, 2.root.subzero.cellframe.net:8190] #[auth] diff --git a/sources/cellframe-node.c b/sources/cellframe-node.c index 0a37adbc51d1bbc0d5f73617d45805cf48f075db..82b74eddb4fe0bd51f25e09b46458ea9667d2275 100755 --- a/sources/cellframe-node.c +++ b/sources/cellframe-node.c @@ -210,7 +210,10 @@ int main( int argc, const char **argv ) { char l_config_dir[MAX_PATH] = {'\0'}; sprintf(l_config_dir, "%s/etc", g_sys_dir_path); - dap_config_init(l_config_dir); + if (dap_config_init(l_config_dir) != 0) { + log_it( L_CRITICAL,"Can't init general configurations" ); + return -1; + } } if ((g_config = dap_config_open(dap_get_appname())) == NULL ) { @@ -407,13 +410,13 @@ int main( int argc, const char **argv ) } #endif - dap_chain_net_load_all(); - if ( dap_chain_node_cli_init(g_config) ) { log_it( L_CRITICAL, "Can't init server for console" ); return -11; } + dap_chain_net_load_all(); + log_it(L_INFO, "Automatic mempool processing %s", dap_chain_node_mempool_autoproc_init() ? "enabled" : "disabled"); diff --git a/version.mk b/version.mk index 7c7a270f81f267f6f7fe09b44f553b55f5086de2..112dc186f47aafb076518d7c59decc9d2a301f45 100644 --- a/version.mk +++ b/version.mk @@ -1,3 +1,3 @@ VERSION_MAJOR=5 VERSION_MINOR=3 -VERSION_PATCH=176 +VERSION_PATCH=178