Merge remote-tracking branch 'origin/master' into musicode

mupifDB/restApiControl.py

@@ -546,6 +546,14 @@ def scheduleExecution(execution_id):
 
 def setExecutionParameter(execution_id, param, value, val_type="str"):
     if api_type == 'granta':
+        if param == 'ExecutionLog':
+            url = RESTserver + 'executions/' + str(execution_id)
+            token = getAuthToken()
+            headers = {'content-type': 'application/json', 'charset': 'UTF-8', 'accept': 'application/json', 'Accept-Charset': 'UTF-8', 'Authorization': f'Bearer {token["access_token"]}'}
+            newdata = {"logs": {"url": "https://musicode.grantami.com/musicode/filestore/%s" % str(value), "description": None}}
+            r = rPatch(url=url, headers=headers, data=json.dumps(newdata))
+            if r.status_code == 200:
+                return True
         return None
     response = rPatch(url=RESTserver + "executions/" + str(execution_id), data=json.dumps({"key": str(param), "value": value}))
     return response.json()

mupifDB/workflowscheduler.py

@@ -312,15 +312,6 @@ def updateStatPersistent (schedulerStat):
 def copyLogToDB (we_id, workflowLogName):
     try:
         log.info("Copying log files to database")
-        # if os.path.exists(tempDir+'/mupif.log'):
-        # temp
-        with open(workflowLogName, 'rb') as f:
-            d = f.read()
-            f.close()
-            f = open('./temp_log.log', 'wb')
-            f.write(d)
-            f.close()
-
         with open(workflowLogName, 'rb') as f:
             logID = restApiControl.uploadBinaryFile(f)
             if logID is not None: