diff --git a/.gitmodules b/.gitmodules index 9fc229b9323ef5f102dfdacf322aba488e74a8a6..565820f1a8f682744d8f3f658c068ed486d8bce1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "libdap"] path = libdap - url = https://github.com/cellframe/libdap.git + url = https://gitlab.demlabs.net/cellframe/libdap.git [submodule "libdap-crypto"] path = libdap-crypto - url = https://github.com/cellframe/libdap-crypto.git + url = https://gitlab.demlabs.net/cellframe/libdap-crypto.git diff --git a/libdap b/libdap index d37b2aa26d2a7cc068529db343a87fd728904d33..6c5dd5a5b0de5573b03ed144c651352467a56101 160000 --- a/libdap +++ b/libdap @@ -1 +1 @@ -Subproject commit d37b2aa26d2a7cc068529db343a87fd728904d33 +Subproject commit 6c5dd5a5b0de5573b03ed144c651352467a56101 diff --git a/libdap-crypto b/libdap-crypto index ff63d762657f9687173db825705b8bf4b958abee..1acfbdd8f5f3caef4c2e584ae2c20ab584b22b4e 160000 --- a/libdap-crypto +++ b/libdap-crypto @@ -1 +1 @@ -Subproject commit ff63d762657f9687173db825705b8bf4b958abee +Subproject commit 1acfbdd8f5f3caef4c2e584ae2c20ab584b22b4e diff --git a/src/libdap-python.c b/src/libdap-python.c index 58e4bb51dc0599b44201e21f25a5563437c7153a..cef5f78b244b4c5997b0ffd8ab5bea99cb75bbf0 100644 --- a/src/libdap-python.c +++ b/src/libdap-python.c @@ -13,14 +13,14 @@ static PyObject *dap_init(PyObject *self, PyObject *args){ const char* log = "_logs.txt"; memcpy(dap_app_name_logs+len_dap_app_name, log,9); 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){ log_it(L_CRITICAL, "Can't init general configurations"); 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 ); return PyLong_FromLong(0); } diff --git a/test/main_test.py b/test/main_test.py index 477febf7f18dcfd70ec6ebaa61c3e29319fca71c..793739ffe904345c79c79460d2825e594ae26185 100644 --- a/test/main_test.py +++ b/test/main_test.py @@ -7,9 +7,9 @@ def create_config_file(app_name): f.write("[server]\nlisten_address=0.0.0.0\n") f.close() -logIt(LogLevel.L_INFO,"Start main test") +print("Start main test") app_name = "TestAPP" -logIt(LogLevel.L_INFO, "Create config file") +print("Create config file") create_config_file(app_name)