Skip to content
Snippets Groups Projects
Commit 708d14af authored by Jorrit Schaap's avatar Jorrit Schaap
Browse files

Task #10898: improved log message

parent 29e3dc03
No related branches found
No related tags found
No related merge requests found
......@@ -114,14 +114,19 @@ class IngestBusListener(AbstractBusListener):
:param task_dict: dictionary with the finished task'''
pass
def _logJobNotification(self, status, job_dict, level=logging.INFO):
msg = 'job %s: %s export_id: %s type: %s server: %s'% (status,
job_dict.get('project'),
job_dict.get('export_id'),
job_dict.get('type'),
job_dict.get('ingest_server'))
try:
msg = 'job '
if status == 'progress':
msg += 'is transferring. '
else:
msg += 'status changed to %s. ' % (status,)
msg += 'project: %s export_id: %s type: %s server: %s'% (job_dict.get('project'),
job_dict.get('export_id'),
job_dict.get('type'),
job_dict.get('ingest_server'))
if job_dict.get('archive_id'):
msg += ' archive_id: %s' % job_dict.get('archive_id')
......@@ -142,11 +147,11 @@ class IngestBusListener(AbstractBusListener):
if job_dict.get('message'):
msg += ' message: %s' % job_dict.get('message')
logger.log(level, msg)
except Exception as e:
logger.error(e)
logger.log(level, msg)
class JobsMonitor(IngestBusListener):
def __init__(self, busname=DEFAULT_INGEST_NOTIFICATION_BUSNAME, subjects=DEFAULT_INGEST_NOTIFICATION_SUBJECTS, broker=DEFAULT_BROKER, listen_for_all_jobs=True, **kwargs):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment