sporada/nopaque
1
0
Fork 0
mirror of https://gitlab.ub.uni-bielefeld.de/sfb1288inf/nopaque.git synced 2024-11-15 01:05:42 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development

Browse Source
This commit is contained in:
Stephan Porada 2019-11-18 16:07:12 +01:00
commit 96db5c1e75
2 changed files with 15 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
app/models.py
View File

@ -2,6 +2,7 @@ from datetime import datetime
from flask import current_app
from flask_login import UserMixin, AnonymousUserMixin
from itsdangerous import BadSignature, TimedJSONWebSignatureSerializer
from time import sleep
from werkzeug.security import generate_password_hash, check_password_hash
from . import db, logger, login_manager
import os
@ -330,23 +331,16 @@ class Job(db.Model):
self.status = 'stopping'
db.session.commit()
while self.status != 'deleted':
''' TODO: wait a second '''
sleep(1)
db.session.refresh(self)
path = os.path.join(current_app.config['OPAQUE_STORAGE_DIRECTORY'],
str(self.user_id), 'jobs', str(self.id))
'''
' TODO: Remove this workaround by executing the following command
' before service removal.
'
' docker service update --mount-rm <service>
'''
while os.path.exists(path):
try:
shutil.rmtree(path)
except Exception as e:
''' TODO: Proper exception handling '''
logger.warning(e)
pass
try:
shutil.rmtree(path)
except Exception as e:
''' TODO: Proper exception handling '''
logger.warning(e)
pass
db.session.delete(self)
db.session.commit()
@ -445,19 +439,12 @@ class Corpus(db.Model):
corpus_file.delete()
path = os.path.join(current_app.config['OPAQUE_STORAGE_DIRECTORY'],
str(self.user_id), 'corpora', str(self.id))
'''
' TODO: Remove this workaround by executing the following command
' before service removal.
'
' docker service update --mount-rm <service>
'''
while os.path.exists(path):
try:
shutil.rmtree(path)
except Exception as e:
''' TODO: Proper exception handling '''
logger.warning(e)
pass
try:
shutil.rmtree(path)
except Exception as e:
''' TODO: Proper exception handling '''
logger.warning(e)
pass
db.session.delete(self)
db.session.commit()

1
app/static/js/add_job.js
View File

@ -19,6 +19,7 @@ function SubmitAddJobForm(newJobFormElement, progressModalElement, request) {
}
if (request.status === 400) {
console.log(JSON.parse(this.responseText));
// TODO print errors under input fields.
}
if (request.status === 500) {
location.reload();