Update daemon

daemon/tasks/check_corpora.py

@@ -1,11 +1,13 @@
 from logger.logger import init_logger
 from tasks import Session, docker_client, NOPAQUE_STORAGE
+from tasks.decorators import background
 from tasks.Models import Corpus
 import docker
 import os
 import shutil
 
 
+@background
 def check_corpora():
     c_session = Session()
     corpora = c_session.query(Corpus).all()
@@ -101,7 +103,7 @@ def __create_cqpserver_container(corpus):
                       'volumes': [corpus_data_dir + ':/corpora/data:rw',
                                   corpus_registry_dir + ':/usr/local/share/cwb/registry:rw'],
                       'name': 'cqpserver_{}'.format(corpus.id),
-                      'network': 'opaque_default'}
+                      'network': 'nopaque_default'}
     container_image = ('gitlab.ub.uni-bielefeld.de:4567/sfb1288inf/cqpserver:latest')
     try:
         container = docker_client.containers.get(container_args['name'])

daemon/tasks/check_jobs.py

@@ -1,12 +1,14 @@
 from datetime import datetime
 from logger.logger import init_logger
 from tasks import Session, docker_client, NOPAQUE_STORAGE
+from tasks.decorators import background
 from tasks.Models import Job, NotificationData, NotificationEmailData, JobResult
 import docker
 import json
 import os
 
 
+@background
 def check_jobs():
     # logger = init_logger()
     cj_session = Session()

daemon/tasks/decorators.py

@@ -0,0 +1,14 @@
+from functools import wraps
+from threading import Thread
+
+
+def background(f):
+    '''
+    ' This decorator executes a function in a Thread.
+    '''
+    @wraps(f)
+    def wrapped(*args, **kwargs):
+        thread = Thread(target=f, args=args, kwargs=kwargs)
+        thread.start()
+        return thread
+    return wrapped

daemon/tasks/notify.py

@@ -2,10 +2,12 @@ from notify.notification import Notification
 from notify.service import NotificationService
 from sqlalchemy import asc
 from tasks import Session
+from tasks.decorators import background
 from tasks.Models import NotificationEmailData
 import os
 
 
+@background
 def notify(execute_flag):
     # If True mails are sent normaly
     # If False mails are not sent. Used to avoid sending mails for jobs that