Skip to content
Snippets Groups Projects
Commit 8ef95969 authored by alexey.stratulat's avatar alexey.stratulat
Browse files

[*] Updated all submodules. Set libdap-python operational according to updated submodules.

parent e8d7f4e8
No related branches found
No related tags found
1 merge request!26Support 3689
[submodule "libdap"] [submodule "libdap"]
path = libdap path = libdap
url = https://github.com/cellframe/libdap.git url = https://gitlab.demlabs.net/cellframe/libdap.git
[submodule "libdap-crypto"] [submodule "libdap-crypto"]
path = libdap-crypto path = libdap-crypto
url = https://github.com/cellframe/libdap-crypto.git url = https://gitlab.demlabs.net/cellframe/libdap-crypto.git
Subproject commit d37b2aa26d2a7cc068529db343a87fd728904d33 Subproject commit 6c5dd5a5b0de5573b03ed144c651352467a56101
Subproject commit ff63d762657f9687173db825705b8bf4b958abee Subproject commit 1acfbdd8f5f3caef4c2e584ae2c20ab584b22b4e
...@@ -13,14 +13,14 @@ static PyObject *dap_init(PyObject *self, PyObject *args){ ...@@ -13,14 +13,14 @@ static PyObject *dap_init(PyObject *self, PyObject *args){
const char* log = "_logs.txt"; const char* log = "_logs.txt";
memcpy(dap_app_name_logs+len_dap_app_name, log,9); memcpy(dap_app_name_logs+len_dap_app_name, log,9);
dap_config_init(system_configs_dir); dap_config_init(system_configs_dir);
if (dap_common_init(dap_app_name, dap_app_name_logs)!=0){
log_it(L_CRITICAL, "Can't init common functions module");
return PyLong_FromLong(-2);
}
if ((g_config = dap_config_open(dap_app_name) ) == NULL){ if ((g_config = dap_config_open(dap_app_name) ) == NULL){
log_it(L_CRITICAL, "Can't init general configurations"); log_it(L_CRITICAL, "Can't init general configurations");
return PyLong_FromLong(-1); return PyLong_FromLong(-1);
} }
if (dap_common_init(dap_app_name_logs)!=0){
log_it(L_CRITICAL, "Can't init common functions module");
return PyLong_FromLong(-2);
}
dap_log_level_set( dap_config_get_item_bool_default(g_config,"general","debug_mode", false)? L_DEBUG: L_NOTICE ); dap_log_level_set( dap_config_get_item_bool_default(g_config,"general","debug_mode", false)? L_DEBUG: L_NOTICE );
return PyLong_FromLong(0); return PyLong_FromLong(0);
} }
......
...@@ -7,9 +7,9 @@ def create_config_file(app_name): ...@@ -7,9 +7,9 @@ def create_config_file(app_name):
f.write("[server]\nlisten_address=0.0.0.0\n") f.write("[server]\nlisten_address=0.0.0.0\n")
f.close() f.close()
logIt(LogLevel.L_INFO,"Start main test") print("Start main test")
app_name = "TestAPP" app_name = "TestAPP"
logIt(LogLevel.L_INFO, "Create config file") print("Create config file")
create_config_file(app_name) create_config_file(app_name)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment