From 8ef9596955b5b5eab1a0e533fadd44795b067950 Mon Sep 17 00:00:00 2001
From: Alexey Stratulat <alexey.stratulat@demlabs.net>
Date: Mon, 26 Aug 2019 12:05:21 +0700
Subject: [PATCH] [*] Updated all submodules. Set libdap-python operational
according to updated submodules.
---
.gitmodules | 4 ++--
libdap | 2 +-
libdap-crypto | 2 +-
src/libdap-python.c | 8 ++++----
test/main_test.py | 4 ++--
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/.gitmodules b/.gitmodules
index 9fc229b..565820f 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 d37b2aa..6c5dd5a 160000
--- a/libdap
+++ b/libdap
@@ -1 +1 @@
-Subproject commit d37b2aa26d2a7cc068529db343a87fd728904d33
+Subproject commit 6c5dd5a5b0de5573b03ed144c651352467a56101
diff --git a/libdap-crypto b/libdap-crypto
index ff63d76..1acfbdd 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 58e4bb5..cef5f78 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 477febf..793739f 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)
--
GitLab