Add log endpoint to CEM api

Author: vogti

api/v1/cem.php

@@ -217,6 +217,21 @@ public function post() {
                 Factory::getNodeFactory()->update($node);
                 break;
 
+            case(strtolower('jobLog')):
+                $jobId = trim($this->request['jobId']);
+                $job = Factory::getJobFactory()->get($jobId);
+                if (!$job) {
+                    $this->setStatusCode(API::STATUS_NUM_JOB_DOES_NOT_EXIST);
+                    throw new Exception('Job does not exist!');
+                }
+                if (empty($this->request['message'])) {
+                    throw new Exception('No log message provided.');
+                }
+                // Make log messages blue
+                $message = "\e[34m" . "CEM > " . $this->request['message'] . "\e[0m\n";
+                Util::appendToJobLog($job, $message );
+                break;
+
             default:
                 throw new Exception('Unsupported action');
         }

api/v1/job.php

@@ -134,8 +134,12 @@ public function post() {
                 }
                 break;
             case(strtolower('appendLog')):
-                $this->appendLog($this->get['id']);
+                if (empty($this->request['log'])) {
+                    throw new Exception('No or insufficient data provided.');
+                }
+                Util::appendToJobLog($job, $this->request['log']);
                 break;
+
             case 'upload':
                 $this->upload($job);
                 break;
@@ -270,32 +274,4 @@ private function getHttpUploadTarget($id) {
         return $data;
     }
 
-
-    /**
-     * @param $id
-     * @throws Exception
-     */
-    private function appendLog($id) {
-        $job = Factory::getJobFactory()->get($id);
-        if (!$job) {
-            $this->setStatusCode(API::STATUS_NUM_JOB_DOES_NOT_EXIST);
-            throw new Exception('Job does not exist!');
-        }
-        if (empty($this->request['log'])) {
-            throw new Exception('No or insufficient data provided.');
-        }
-
-        // check if the data directory is mounted and if not, mount it
-        /*$mount = new Mount_Library();
-        if ($mount->checkIfDataDirectoryIsMounted() === false) {
-            Logger_Library::getInstance()->warning("Data directory is not mounted. Execute mount!");
-            $mount->mountDataDirectory();
-        }*/ // skip mount
-
-        // write log to file
-        if (!file_exists(UPLOADED_DATA_PATH . 'log')) {
-            mkdir(UPLOADED_DATA_PATH . 'log');
-        }
-        file_put_contents(UPLOADED_DATA_PATH . 'log/' . $id . '.log', $this->request['log'], FILE_APPEND);
-    }
 }

core/util.php

@@ -610,4 +610,23 @@ public static function extractSoftwareVersionElements($experiment): array {
         return $versionInputs;
     }
 
+    /**
+     * @param Job $job
+     * @param string $message
+     */
+    public static function appendToJobLog(DBA\Job $job, string $message) {
+        // check if the data directory is mounted and if not, mount it
+        /*$mount = new Mount_Library();
+        if ($mount->checkIfDataDirectoryIsMounted() === false) {
+            Logger_Library::getInstance()->warning("Data directory is not mounted. Execute mount!");
+            $mount->mountDataDirectory();
+        }*/ // skip mount
+
+        // write log to file
+        if (!file_exists(UPLOADED_DATA_PATH . 'log')) {
+            mkdir(UPLOADED_DATA_PATH . 'log');
+        }
+        file_put_contents(UPLOADED_DATA_PATH . 'log/' . $job->getId() . '.log', $message, FILE_APPEND);
+    }
+
 }