Refactoring

Author: balis

examples/RemoteJobs/functions.js

@@ -2,19 +2,19 @@ var spawn = require('child_process').spawn;
 
 // Spawns a job "node handler.js" and waits for the notification of its
 // completion using the Redis job status notification mechanism
-async function job_status_redis_test(ins, outs, context, cb) {
+async function submitRemoteJob(ins, outs, context, cb) {
   var n = Number(ins.number.data[0]);
 
   //console.log("Spawning process...");
 
-  const executable = context.executor.executable;
+  const executable = context.command.executable;
   let jobMessage = JSON.stringify({
         "executable": executable,
-        "args": context.executor.args,
-        "env": (context.executor.env || {}),
+        "args": context.command.args,
+        "env": context.command.env || {},
         "inputs": ins.map(i => i),
         "outputs": outs.map(o => o),
-        "stdout": context.executor.stdout, // if present, denotes file name to which stdout should be redirected
+        "stdout": context.command.stdout, // if present, denotes file name to which stdout should be redirected
       	"redis_url": context.redis_url,
       	"taskId": context.taskId
   });
@@ -55,4 +55,4 @@ async function job_status_redis_test(ins, outs, context, cb) {
   }
 }
 
-exports.job_status_redis_test = job_status_redis_test;
+exports.submitRemoteJob = submitRemoteJob;

examples/RemoteJobs/handler.js

@@ -20,10 +20,7 @@ var getJobMessage = async function (timeout) {
     return new Promise(function (resolve, reject) {
         const jobMsgKey = taskId + "_msg";
         rcl.brpop(jobMsgKey, timeout, function (err, reply) {
-            if (err) reject(err)
-            else {
-                resolve(reply);
-            }
+            err ? reject(err): resolve(reply)
         });
     });
 }
@@ -32,10 +29,7 @@ var getJobMessage = async function (timeout) {
 var notifyJobCompletion = async function () {
     return new Promise(function (resolve, reject) {
         rcl.rpush(taskId, "OK", function (err, reply) {
-            if (err) reject(err)
-            else {
-                resolve(reply);
-            }
+            err ? reject(err): resolve(reply)
         });
     });
 }

examples/RemoteJobs/workflow.json

@@ -1,22 +1,22 @@
 {
-  "name": "RedisNotificationTestWorkflow",
+  "name": "RemoteJobsTestWorkflow",
   "processes": [ {
-    "name": "RedisNotificationTest",
+    "name": "SubmitRemoteJob",
     "type": "dataflow",
     "parlevel": 0,
     "firingLimit": 100,
-    "function": "job_status_redis_test",
+    "function": "submitRemoteJob",
     "config": {
-        "executor": {
-            "executable": "echo",
-            "args": ["Hello", "world"]
-        }
+      "command": {
+        "executable": "echo",
+        "args": ["Hello", "world"]
+      }
     },
     "ins": [ "number" ],
     "outs": [ ]
   } ],
   "signals": [ {
-      "name": "number",
+    "name": "number",
     "data": [ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100 ]
   } ],
   "ins": [ "number" ],