Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
V
vospace-transfer-service
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
VOSpace INAF
vospace-transfer-service
Commits
cbaa83b3
Commit
cbaa83b3
authored
Oct 5, 2021
by
Cristiano Urban
Browse files
Options
Downloads
Patches
Plain Diff
Cleanup.
Signed-off-by:
Cristiano Urban
<
cristiano.urban@inaf.it
>
parent
5443c9a7
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Pipeline
#2446
passed
Oct 5, 2021
Stage: dockerize
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
transfer_service/db_connector.py
+1
-6
1 addition, 6 deletions
transfer_service/db_connector.py
transfer_service/transfer_service.py
+1
-2
1 addition, 2 deletions
transfer_service/transfer_service.py
with
2 additions
and
8 deletions
transfer_service/db_connector.py
+
1
−
6
View file @
cbaa83b3
...
...
@@ -1014,9 +1014,6 @@ class DbConnector(object):
(
node
.
parentPath
,))
result
=
cursor
.
fetchall
()
parentLtreePath
=
result
[
0
][
"
path
"
]
parentLtreeRelativePath
=
""
if
"
.
"
in
parentLtreePath
:
parentLtreeRelativePath
=
"
.
"
.
join
(
parentLtreePath
.
strip
(
"
.
"
).
split
(
'
.
'
)[
1
:])
except
Exception
:
if
not
conn
.
closed
:
conn
.
rollback
()
...
...
@@ -1025,7 +1022,6 @@ class DbConnector(object):
try
:
cursor
.
execute
(
"""
INSERT INTO node(parent_path,
parent_relative_path,
fs_path,
name,
tstamp_wrapper_dir,
...
...
@@ -1037,13 +1033,12 @@ class DbConnector(object):
creator_id,
content_length,
content_md5)
VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s,
%s,
%s)
VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s)
ON CONFLICT
DO NOTHING
RETURNING node_id;
"""
,
(
parentLtreePath
,
parentLtreeRelativePath
,
node
.
fsPath
,
node
.
name
,
node
.
wrapperDir
,
...
...
This diff is collapsed.
Click to expand it.
transfer_service/transfer_service.py
+
1
−
2
View file @
cbaa83b3
...
...
@@ -87,8 +87,7 @@ class TransferService(object):
self
.
logger
.
info
(
"""
##########################################################
########## VOSpace Transfer Service is RUNNING! ##########
##########################################################
"""
)
##########################################################
"""
)
#else:
# print("The VOSpace Transfer Service requires super user privileges.")
# sys.exit(1)
...
...
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
sign in
to comment