From 0c608b709e8540b26f8a2f35081d02a31737bd9e Mon Sep 17 00:00:00 2001
From: Alexey Stratulat <alexey.stratulat@demlabs.net>
Date: Sun, 25 Aug 2019 23:21:56 +0700
Subject: [PATCH] [*] He returned dap_common initialization and added two
parameters to initialize the module. Accordingly, I modified the test file to
verify the changes.
---
src/libdap-server-core-python.c | 7 ++++++-
test/test.py | 2 +-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/libdap-server-core-python.c b/src/libdap-server-core-python.c
index 7719952c..64b56828 100644
--- a/src/libdap-server-core-python.c
+++ b/src/libdap-server-core-python.c
@@ -4,9 +4,14 @@
static PyObject *dap_server_core_init(PyObject *self, PyObject *args){
uint32_t l_thread_cnt;
size_t conn_t;
- if (!PyArg_ParseTuple(args, "I|n", &l_thread_cnt, &conn_t)){
+ const char *app_name;
+ const char *app_log;
+ if (!PyArg_ParseTuple(args, "I|n|s|s", &l_thread_cnt, &conn_t, &app_name, &app_log)){
return NULL;
}
+ int32_t result_common_init = dap_common_init(app_name, app_log);
+ if (result_common_init != 0)
+ return PyLong_FromLong(result_common_init);
int32_t result = dap_server_init(l_thread_cnt);
if ( result != 0 ) {
log_it( L_CRITICAL, "Can't init socket server module" );
diff --git a/test/test.py b/test/test.py
index 2780abb1..4f484048 100644
--- a/test/test.py
+++ b/test/test.py
@@ -1,6 +1,6 @@
import libDapServerCore as server
print ("Start wrapping libdap server core python module")
-res_i = server.init(1, 0)
+res_i = server.init(1, 0, "TestServer", "TestServer.txt")
rc = server.listen("0.0.0.0", 3307, 0)
server.deinit()
--
GitLab