sporada/nopaque
1
0
Fork 0
mirror of https://gitlab.ub.uni-bielefeld.de/sfb1288inf/nopaque.git synced 2025-06-22 05:50:34 +00:00
Code Issues Projects Releases Wiki Activity

Don't use module level logger functions

Browse Source
This commit is contained in:
Patrick Jentsch
2021-09-16 11:15:31 +02:00
parent 2af74db46f
commit 5469bd0ec1
6 changed files with 48 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
app/tasks/corpus_utils.py
View File

@ -1,7 +1,6 @@
from flask import current_app
from ..models import Corpus
import docker
import logging
import os
import shutil
@ -78,7 +77,7 @@ class CheckCorporaMixin:
restart_policy=restart_policy
)
except docker.errors.APIError as e:
logging.error(
current_app.logger.error(
'Create "{}" service raised '.format(name)
+ '"docker.errors.APIError" The server returned an error. '
+ 'Details: {}'.format(e)
@ -91,20 +90,20 @@ class CheckCorporaMixin:
try:
service = self.docker.services.get(service_name)
except docker.errors.NotFound:
logging.error(
current_app.logger.error(
'Get "{}" service raised '.format(service_name)
+ '"docker.errors.NotFound" The service does not exist. '
+ '(corpus.status: {} -> failed)'.format(corpus.status)
)
corpus.status = 'failed'
except docker.errors.APIError as e:
logging.error(
current_app.logger.error(
'Get "{}" service raised '.format(service_name)
+ '"docker.errors.APIError" The server returned an error. '
+ 'Details: {}'.format(e)
)
except docker.errors.InvalidVersion:
logging.error(
current_app.logger.error(
'Get "{}" service raised '.format(service_name)
+ '"docker.errors.InvalidVersion" One of the arguments is '
+ 'not supported with the current API version.'
@ -121,7 +120,7 @@ class CheckCorporaMixin:
try:
service.remove()
except docker.errors.APIError as e:
logging.error(
current_app.logger.error(
'Remove "{}" service raised '.format(service_name)
+ '"docker.errors.APIError" The server returned an error. ' # noqa
+ 'Details: {}'.format(e)
@ -162,7 +161,7 @@ class CheckCorporaMixin:
except docker.errors.NotFound:
pass
except docker.errors.APIError as e:
logging.error(
current_app.logger.error(
'Get "{}" container raised '.format(name)
+ '"docker.errors.APIError" The server returned an error. '
+ 'Details: {}'.format(e)
@ -172,7 +171,7 @@ class CheckCorporaMixin:
try:
container.remove(force=True)
except docker.errors.APIError as e:
logging.error(
current_app.logger.error(
'Remove "{}" container raised '.format(name)
+ '"docker.errors.APIError" The server returned an error. '
+ 'Details: {}'.format(e)
@ -184,21 +183,21 @@ class CheckCorporaMixin:
network=network)
except docker.errors.ContainerError:
# This case should not occur, because detach is True.
logging.error(
current_app.logger.error(
'Run "{}" container raised '.format(name)
+ '"docker.errors.ContainerError" The container exits with a '
+ 'non-zero exit code and detach is False.'
)
corpus.status = 'failed'
except docker.errors.ImageNotFound:
logging.error(
current_app.logger.error(
'Run "{}" container raised '.format(name)
+ '"docker.errors.ImageNotFound" The specified image does not '
+ 'exist.'
)
corpus.status = 'failed'
except docker.errors.APIError as e:
logging.error(
current_app.logger.error(
'Run "{}" container raised '.format(name)
+ '"docker.errors.APIError" The server returned an error. '
+ 'Details: {}'.format(e)
@ -211,10 +210,12 @@ class CheckCorporaMixin:
try:
self.docker.containers.get(container_name)
except docker.errors.NotFound:
logging.error('Could not find "{}" but the corpus state is "analysing".') # noqa
current_app.logger.error(
'Could not find "{}" but the corpus state is "analysing".'
)
corpus.status = 'prepared'
except docker.errors.APIError as e:
logging.error(
current_app.logger.error(
'Get "{}" container raised '.format(container_name)
+ '"docker.errors.APIError" The server returned an error. '
+ 'Details: {}'.format(e)
@ -228,7 +229,7 @@ class CheckCorporaMixin:
except docker.errors.NotFound:
pass
except docker.errors.APIError as e:
logging.error(
current_app.logger.error(
'Get "{}" container raised '.format(container_name)
+ '"docker.errors.APIError" The server returned an error. '
+ 'Details: {}'.format(e)
@ -238,7 +239,7 @@ class CheckCorporaMixin:
try:
container.remove(force=True)
except docker.errors.APIError as e:
logging.error(
current_app.logger.error(
'Remove "{}" container raised '.format(container_name)
+ '"docker.errors.APIError" The server returned an error. '
+ 'Details: {}'.format(e)

19
app/tasks/job_utils.py
View File

@ -5,7 +5,6 @@ from .. import db
from ..models import Job, JobResult
import docker
import json
import logging
import os
import shutil
@ -96,7 +95,7 @@ class CheckJobsMixin:
restart_policy=restart_policy
)
except docker.errors.APIError as e:
logging.error(
current_app.logger.error(
'Create "{}" service raised '.format(name)
+ '"docker.errors.APIError" The server returned an error. '
+ 'Details: {}'.format(e)
@ -110,21 +109,21 @@ class CheckJobsMixin:
try:
service = self.docker.services.get(service_name)
except docker.errors.NotFound:
logging.error(
current_app.logger.error(
'Get "{}" service raised '.format(service_name)
+ '"docker.errors.NotFound" The service does not exist. '
+ '(job.status: {} -> failed)'.format(job.status)
)
job.status = 'failed'
except docker.errors.APIError as e:
logging.error(
current_app.logger.error(
'Get "{}" service raised '.format(service_name)
+ '"docker.errors.APIError" The server returned an error. '
+ 'Details: {}'.format(e)
)
return
except docker.errors.InvalidVersion:
logging.error(
current_app.logger.error(
'Get "{}" service raised '.format(service_name)
+ '"docker.errors.InvalidVersion" One of the arguments is '
+ 'not supported with the current API version.'
@ -141,7 +140,7 @@ class CheckJobsMixin:
try:
service.remove()
except docker.errors.APIError as e:
logging.error(
current_app.logger.error(
'Remove "{}" service raised '.format(service_name)
+ '"docker.errors.APIError" The server returned an error. ' # noqa
+ 'Details: {}'.format(e)
@ -167,14 +166,14 @@ class CheckJobsMixin:
except docker.errors.NotFound:
job.status = 'canceled'
except docker.errors.APIError as e:
logging.error(
current_app.logger.error(
'Get "{}" service raised '.format(service_name)
+ '"docker.errors.APIError" The server returned an error. '
+ 'Details: {}'.format(e)
)
return
except docker.errors.InvalidVersion:
logging.error(
current_app.logger.error(
'Get "{}" service raised '.format(service_name)
+ '"docker.errors.InvalidVersion" One of the arguments is '
+ 'not supported with the current API version.'
@ -184,7 +183,7 @@ class CheckJobsMixin:
try:
service.update(mounts=None)
except docker.errors.APIError as e:
logging.error(
current_app.logger.error(
'Update "{}" service raised '.format(service_name)
+ '"docker.errors.APIError" The server returned an error. '
+ 'Details: {}'.format(e)
@ -193,7 +192,7 @@ class CheckJobsMixin:
try:
service.remove()
except docker.errors.APIError as e:
logging.error(
current_app.logger.error(
'Remove "{}" service raised '.format(service_name)
+ '"docker.errors.APIError" The server returned an error. '
+ 'Details: {}'.format(e)