Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
python-cellframe
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Code
Merge requests
2
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
cellframe
python-cellframe
Commits
8ef95969
Commit
8ef95969
authored
5 years ago
by
alexey.stratulat
Browse files
Options
Downloads
Patches
Plain Diff
[*] Updated all submodules. Set libdap-python operational according to updated submodules.
parent
e8d7f4e8
No related branches found
No related tags found
1 merge request
!26
Support 3689
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
.gitmodules
+2
-2
2 additions, 2 deletions
.gitmodules
libdap
+1
-1
1 addition, 1 deletion
libdap
libdap-crypto
+1
-1
1 addition, 1 deletion
libdap-crypto
src/libdap-python.c
+4
-4
4 additions, 4 deletions
src/libdap-python.c
test/main_test.py
+2
-2
2 additions, 2 deletions
test/main_test.py
with
10 additions
and
10 deletions
.gitmodules
+
2
−
2
View file @
8ef95969
[submodule "libdap"]
[submodule "libdap"]
path = libdap
path = libdap
url = https://git
hub.com
/cellframe/libdap.git
url = https://git
lab.demlabs.net
/cellframe/libdap.git
[submodule "libdap-crypto"]
[submodule "libdap-crypto"]
path = libdap-crypto
path = libdap-crypto
url = https://git
hub.com
/cellframe/libdap-crypto.git
url = https://git
lab.demlabs.net
/cellframe/libdap-crypto.git
This diff is collapsed.
Click to expand it.
libdap
@
6c5dd5a5
Subproject commit
d37b2aa26d2a7cc068529db343a87fd728904d33
Subproject commit
6c5dd5a5b0de5573b03ed144c651352467a56101
This diff is collapsed.
Click to expand it.
libdap-crypto
@
1acfbdd8
Subproject commit
ff63d762657f9687173db825705b8bf4b958abe
e
Subproject commit
1acfbdd8f5f3caef4c2e584ae2c20ab584b22b4
e
This diff is collapsed.
Click to expand it.
src/libdap-python.c
+
4
−
4
View file @
8ef95969
...
@@ -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
);
}
}
...
...
This diff is collapsed.
Click to expand it.
test/main_test.py
+
2
−
2
View file @
8ef95969
...
@@ -7,9 +7,9 @@ def create_config_file(app_name):
...
@@ -7,9 +7,9 @@ def create_config_file(app_name):
f
.
write
(
"
[server]
\n
listen_address=0.0.0.0
\n
"
)
f
.
write
(
"
[server]
\n
listen_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
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment