adapted to merlin plugin

code/worker.py

@@ -4,9 +4,27 @@ import os
 import shutil
 import datetime
 import FilesUtilities
+import logging
+from logging.handlers import TimedRotatingFileHandler
 
 app = Flask(__name__)
 
+logPath = '/workdir/logs/workerlogs'
+
+if not os.path.exists(logPath):
+    os.makedirs(logPath)
+
+# format the log entries
+formatter = logging.Formatter('%(asctime)s %(name)s %(levelname)s %(message)s')
+
+handler = TimedRotatingFileHandler(logPath + '/worker.log', when='midnight', backupCount=20)
+handler.setFormatter(formatter)
+logger = logging.getLogger(__name__)
+logger.addHandler(handler)
+logger.setLevel(logging.DEBUG)
+
+#####
+
 PROCESS_PATH = '/home/transyt.py'
 SUBMISSIONS_PATH = '/workdir/workerSubmissions/'
 RESULTS_PATH = '/workdir/resultsWorker/'
@@ -22,6 +40,8 @@ start_time = datetime.datetime.now()
 
 running = False
 
+logging.info("worker running...")
+
 @app.after_request
 def after_request(response):
     response.headers["Cache-Control"] = "no-cache, no-store, must-revalidate, public, max-age=0"
@@ -34,6 +54,8 @@ def start():
     global start_time
     global running
 
+    logger.info("Submission in progress...")
+
     start_time = datetime.datetime.now()
 
     if os.path.exists(SUBMISSIONS_PATH):
@@ -45,19 +67,24 @@ def start():
     os.makedirs(SUBMISSIONS_PATH)
     os.makedirs(RESULTS_PATH)
 
+    logger.debug("directories reset complete")
+
     try:
         for file in request.files.values():
             destination = "/".join([SUBMISSIONS_PATH, file.filename])
+            logger.info("saving file " + destination)
             file.save(destination)
 
         subprocess.Popen(["python", PROCESS_PATH, SUBMISSIONS_PATH, RESULTS_PATH])
 
         running = True
 
+        logger.info("returning code 102!")
+
         return ('processing', 102)
 
     except IndexError:
-        print('An error occurred while processing the submission')
+        logger.info('An error occurred while processing the submission, returning code 500!')
         return ('error', 500)
 
 
@@ -80,6 +107,7 @@ def display_msg():
 
 @app.route('/handshake')
 def handshake():
+    logger.info("handshake requested!")
     return jsonify({"result": "alive"}), 200