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

This commit is contained in:
Stephan Porada 2020-06-10 15:10:29 +02:00
commit b99bfd9854

View File

@ -1,4 +1,3 @@
from logger.logger import init_logger
from tasks.check_corpora import check_corpora from tasks.check_corpora import check_corpora
from tasks.check_jobs import check_jobs from tasks.check_jobs import check_jobs
from tasks.notify import notify from tasks.notify import notify
@ -7,7 +6,6 @@ import os
def nopaqued(): def nopaqued():
logger = init_logger()
NOPAQUE_EXECUTE_NOTIFICATIONS = os.environ.get('NOPAQUE_EXECUTE_NOTIFICATIONS', 'True').lower() == 'true' # noqa NOPAQUE_EXECUTE_NOTIFICATIONS = os.environ.get('NOPAQUE_EXECUTE_NOTIFICATIONS', 'True').lower() == 'true' # noqa
threads = {'check_corpora': None, 'check_jobs': None, 'notify': None} threads = {'check_corpora': None, 'check_jobs': None, 'notify': None}
@ -15,13 +13,10 @@ def nopaqued():
threads['check_jobs'] = check_jobs() threads['check_jobs'] = check_jobs()
threads['notify'] = notify(NOPAQUE_EXECUTE_NOTIFICATIONS) threads['notify'] = notify(NOPAQUE_EXECUTE_NOTIFICATIONS)
while True: while True:
logger.warning('check_corpora: {}'.format(threads['check_corpora'].is_alive()))
if not threads['check_corpora'].is_alive(): if not threads['check_corpora'].is_alive():
threads['check_corpora'] = check_corpora() threads['check_corpora'] = check_corpora()
logger.warning('check_jobs: {}'.format(threads['check_jobs'].is_alive()))
if not threads['check_jobs'].is_alive(): if not threads['check_jobs'].is_alive():
threads['check_jobs'] = check_jobs() threads['check_jobs'] = check_jobs()
logger.warning('notify: {}'.format(threads['notify'].is_alive()))
if not threads['notify'].is_alive(): if not threads['notify'].is_alive():
threads['notify'] = notify(NOPAQUE_EXECUTE_NOTIFICATIONS) threads['notify'] = notify(NOPAQUE_EXECUTE_NOTIFICATIONS)
# If execute_notifications True mails are sent. # If execute_notifications True mails are sent.