Added global identifier "hfid". All IDs (hfId, appId, procId, firingId) are passed to the activity function (in parameter 'config').

Author: balis

bin/hflow

@@ -73,11 +73,11 @@ function hflow_run() {
 
   var createWf = function(cb) {
     rcl.select(dbId, function(err, rep) {
-      rcl.flushdb(function(err, rep) {
+      //rcl.flushdb(function(err, rep) { // flushing db here deletes the global 'hfid' entry (created earlier)
         wflib.createInstanceFromFile(wffile, '', function(err, id) {
           cb(err, id); 
         });
-      });
+      //});
     });
   }
 

engine2/process.js

@@ -306,9 +306,10 @@ var ProcLogic = function() {
             }
         }
 
-        proc.wflib.invokeTaskFunction2(
+        proc.wflib.invokeProcFunction(
                 proc.appId,
                 proc.procId,
+		proc.firingId, 
                 funcIns,
                 proc.sigValues,
                 funcOuts, emul,

functions/index.js

@@ -26,6 +26,8 @@ function print2(ins, outs, config, cb) {
             console.log(input.data);
         }
     });
+    console.log("CONFIG");
+    console.log(config);
     cb(null, outs);
 }
 

package.json

@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "express": "3.x",
-    "consolidate": "0.9.1",
+    "consolidate": "0.10.x",
     "cradle": "0.6.6",
     "ejs": "0.8.4",
     "eyes": "0.1.8",

wflib/index.js

@@ -11,12 +11,18 @@ var fs = require('fs'),
     Q = require('q'),
     pathTool = require('path'),
     //toobusy = require('toobusy'),
+    uuid = require('uuid'),
     rcl;
 
+
 // for profiling
 var fetchInputsTime = 0;
 var sendSignalTime = 0;
 
+
+var global_hfid = 0; // global UUID of this HF engine instance (used for logging)
+var globalInfo = {}; // object holding global information for a given HF engine instance 
+
 function p0() {
     return (new Date()).getTime();
 }
@@ -33,7 +39,19 @@ exports.init = function(redisClient) {
     // optional passing of client could be possible);
     if (redisClient) {
         rcl = redisClient;
+	if (global_hfid == 0) {
+	  global_hfid = uuid.v1();
+
+	  // this object holds global information about this HF engine instance
+	  // written to redis as a hash map with key "globalinfo:<uuid>"
+	  // TODO: add more attributes
+	  globalInfo.hf_version = "???";
+
+	  rcl.hmset("hflow:"+global_hfid, globalInfo, function(err, ret) { });
+	}
     }
+
+   console.log("hfid:", global_hfid);
     /*rcl.on("error", function (err) {
       console.log("redis error: " + err);
       });*/
@@ -1336,7 +1354,7 @@ function public_getRemoteDataSinks(wfId, dataId, cb) {
  * @insValues - array of input signal values as returned by fetchInputs
  * @appConfig - configuration specific for this workflow instance (the engine.config object), e.g. working directory
  */
-function public_invokeTaskFunction2(wfId, taskId, insIds_, insValues, outsIds_, emulate, eventServer, appConfig, cb) {
+function public_invokeProcFunction(wfId, procId, firingId, insIds_, insValues, outsIds_, emulate, eventServer, appConfig, cb) {
     function isArray(what) {
         return Object.prototype.toString.call(what) === '[object Array]';
     }
@@ -1377,7 +1395,7 @@ function public_invokeTaskFunction2(wfId, taskId, insIds_, insValues, outsIds_,
 
     //onsole.log("FUNC INS", ins);
 
-    public_getTaskInfo(wfId, taskId, function(err, taskInfo) {
+    public_getTaskInfo(wfId, procId, function(err, taskInfo) {
         if (err) return cb(err); 
 
         var asyncTasks = [];
@@ -1474,6 +1492,12 @@ function public_invokeTaskFunction2(wfId, taskId, insIds_, insValues, outsIds_,
                     conf['eventServer'] = eventServer;
                 }
 
+		// Pass identifiers to the function
+		conf.hfId = global_hfid;
+		conf.appId = wfId;
+		conf.procId = procId;
+		conf.firingId = firingId;
+
                 f(ins, outs, conf, function(err, outs, options) {
                     //if (outs) { onsole.log("VALUE="+outs[0].value); } // DEBUG 
                     cb(null, outs, options);
@@ -1930,7 +1954,7 @@ return {
     getRemoteDataSinks: public_getRemoteDataSinks,
     getWfMap: public_getWfMap,
     getTaskMap: public_getTaskMap,
-    invokeTaskFunction2: public_invokeTaskFunction2,
+    invokeProcFunction: public_invokeProcFunction,
     //sendSignal: public_sendSignal,
     sendSignal: sendSignalLua,
     getSignalInfo: getSignalInfo,
@@ -1941,7 +1965,9 @@ return {
     sendSignalLua: sendSignalLua,
     getSigByName: getSigByName,
     getSigRemoteSinks: getSigRemoteSinks,
-    setSigRemoteSinks: setSigRemoteSinks
+    setSigRemoteSinks: setSigRemoteSinks,
+
+    hfid: global_hfid
 };
 
 };