Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
nopaque
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Monitor
Service Desk
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Admin message
Looking for advice? Join the
Matrix channel for GitLab users in Bielefeld
!
Show more breadcrumbs
SFB 1288 - INF
nopaque
Commits
8f3517d5
Commit
8f3517d5
authored
5 years ago
by
Patrick Jentsch
Browse files
Options
Downloads
Patches
Plain Diff
Remove logging code
parent
b0cf581d
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
app/models.py
+0
-19
0 additions, 19 deletions
app/models.py
with
0 additions
and
19 deletions
app/models.py
+
0
−
19
View file @
8f3517d5
...
@@ -7,7 +7,6 @@ from . import db
...
@@ -7,7 +7,6 @@ from . import db
from
.
import
login_manager
from
.
import
login_manager
import
os
import
os
import
shutil
import
shutil
import
logging
import
xml.etree.ElementTree
as
ET
import
xml.etree.ElementTree
as
ET
...
@@ -226,13 +225,10 @@ class User(UserMixin, db.Model):
...
@@ -226,13 +225,10 @@ class User(UserMixin, db.Model):
Delete user from database. Also delete all associated jobs and corpora
Delete user from database. Also delete all associated jobs and corpora
files.
files.
"""
"""
logger
=
logging
.
getLogger
(
__name__
)
delete_path
=
os
.
path
.
join
(
'
/mnt/opaque/
'
,
str
(
self
.
id
))
delete_path
=
os
.
path
.
join
(
'
/mnt/opaque/
'
,
str
(
self
.
id
))
logger
.
warning
(
'
Delete path for user is: {}
'
.
format
(
delete_path
))
while
os
.
path
.
exists
(
delete_path
):
while
os
.
path
.
exists
(
delete_path
):
try
:
try
:
shutil
.
rmtree
(
delete_path
,
ignore_errors
=
True
)
shutil
.
rmtree
(
delete_path
,
ignore_errors
=
True
)
logger
.
warning
(
'
Path does still exist.
'
)
except
OSError
:
except
OSError
:
pass
pass
db
.
session
.
delete
(
self
)
db
.
session
.
delete
(
self
)
...
@@ -383,14 +379,11 @@ class Job(db.Model):
...
@@ -383,14 +379,11 @@ class Job(db.Model):
for good.
for good.
See: https://docs.docker.com/engine/swarm/swarm-tutorial/delete-service/
See: https://docs.docker.com/engine/swarm/swarm-tutorial/delete-service/
"""
"""
logger
=
logging
.
getLogger
(
__name__
)
delete_path
=
os
.
path
.
join
(
'
/mnt/opaque/
'
,
str
(
self
.
user_id
),
'
jobs
'
,
delete_path
=
os
.
path
.
join
(
'
/mnt/opaque/
'
,
str
(
self
.
user_id
),
'
jobs
'
,
str
(
self
.
id
))
str
(
self
.
id
))
logger
.
warning
(
'
Delete path is: {}
'
.
format
(
delete_path
))
while
os
.
path
.
exists
(
delete_path
):
while
os
.
path
.
exists
(
delete_path
):
try
:
try
:
shutil
.
rmtree
(
delete_path
,
ignore_errors
=
True
)
shutil
.
rmtree
(
delete_path
,
ignore_errors
=
True
)
logger
.
warning
(
'
Path does still exist.
'
)
except
OSError
:
except
OSError
:
pass
pass
db
.
session
.
delete
(
self
)
db
.
session
.
delete
(
self
)
...
@@ -412,15 +405,12 @@ class CorpusFile(db.Model):
...
@@ -412,15 +405,12 @@ class CorpusFile(db.Model):
corpus_id
=
db
.
Column
(
db
.
Integer
,
db
.
ForeignKey
(
'
corpora.id
'
))
corpus_id
=
db
.
Column
(
db
.
Integer
,
db
.
ForeignKey
(
'
corpora.id
'
))
def
delete
(
self
):
def
delete
(
self
):
logger
=
logging
.
getLogger
(
__name__
)
logger
.
warning
(
'
Called CorpusFile.delete
'
)
path
=
os
.
path
.
join
(
current_app
.
config
[
'
OPAQUE_STORAGE_DIRECTORY
'
],
path
=
os
.
path
.
join
(
current_app
.
config
[
'
OPAQUE_STORAGE_DIRECTORY
'
],
self
.
dir
,
self
.
dir
,
self
.
filename
)
self
.
filename
)
try
:
try
:
os
.
remove
(
path
)
os
.
remove
(
path
)
except
:
except
:
logger
.
warning
(
'
[ERROR] CorpusFile.delete
'
)
return
return
self
.
corpus
.
status
=
'
unprepared
'
self
.
corpus
.
status
=
'
unprepared
'
db
.
session
.
delete
(
self
)
db
.
session
.
delete
(
self
)
...
@@ -473,24 +463,15 @@ class Corpus(db.Model):
...
@@ -473,24 +463,15 @@ class Corpus(db.Model):
'
user_id
'
:
self
.
user_id
}
'
user_id
'
:
self
.
user_id
}
def
delete
(
self
):
def
delete
(
self
):
logger
=
logging
.
getLogger
(
__name__
)
logger
.
warning
(
'
Called Corpus.delete
'
)
for
corpus_file
in
self
.
files
:
for
corpus_file
in
self
.
files
:
corpus_file
.
delete
()
corpus_file
.
delete
()
logger
.
warning
(
'
bis hierhin und nicht weiter
'
)
logger
.
warning
(
'
base_dir: {}
'
.
format
(
current_app
.
config
[
'
OPAQUE_STORAGE_DIRECTORY
'
]))
logger
.
warning
(
'
user_id: {}
'
.
format
(
self
.
user_id
))
logger
.
warning
(
'
id: {}
'
.
format
(
self
.
id
))
path
=
os
.
path
.
join
(
current_app
.
config
[
'
OPAQUE_STORAGE_DIRECTORY
'
],
path
=
os
.
path
.
join
(
current_app
.
config
[
'
OPAQUE_STORAGE_DIRECTORY
'
],
str
(
self
.
user_id
),
str
(
self
.
user_id
),
'
corpora
'
,
'
corpora
'
,
str
(
self
.
id
))
str
(
self
.
id
))
logger
.
warning
(
path
)
try
:
try
:
logger
.
warning
(
'
Try to remove {}
'
.
format
(
path
))
shutil
.
rmtree
(
path
)
shutil
.
rmtree
(
path
)
except
:
except
:
logger
.
warning
(
'
[ERROR] Corpus.delete
'
)
return
return
db
.
session
.
delete
(
self
)
db
.
session
.
delete
(
self
)
db
.
session
.
commit
()
db
.
session
.
commit
()
...
...
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