Add support to REDIS_URL

Author: kfigiela

bin/hflow

@@ -1,10 +1,14 @@
 #!/usr/bin/env node
+
+var redisURL = process.env.REDIS_URL ? {url: process.env.REDIS_URL} : {};
+
+
 var docopt = require('docopt').docopt,
     spawn = require('child_process').spawn,
-    fs = require('fs'), 
+    fs = require('fs'),
     pathtool = require('path'),
     redis = require('redis'),
-    rcl = redis.createClient(),
+    rcl = redis.createClient(redisURL),
     wflib = require('../wflib').init(rcl),
     Engine = require('../engine2'),
     async = require('async'),
@@ -42,15 +46,15 @@ function hflow_run() {
   if (opts['--with-server']) {
       hflow_start(); // start the HTTP server
   }
-  
+
   if (wfstats.isDirectory()) {
     wffile = pathtool.join(wfpath, "workflow.json");
   } else if (wfstats.isFile()) {
     wffile = wfpath;
     wfpath = pathtool.dirname(wfpath);
   }
 
-  var runWf = function(wfId) { 
+  var runWf = function(wfId) {
     var config = {"emulate":"false", "workdir": pathtool.resolve(wfpath)};
     var engine = new Engine(config, wflib, wfId, function(err) {
       // This represent custom plugin listening on event from available eventServer
@@ -62,7 +66,7 @@ function hflow_run() {
         if (opts['-s']) {
           // Flag -s is present: send all input signals to the workflow -> start execution
           wflib.getWfIns(wfId, false, function(err, wfIns) {
-            engine.wflib.getSignalInfo(wfId, wfIns, function(err, sigs) { 
+            engine.wflib.getSignalInfo(wfId, wfIns, function(err, sigs) {
               engine.emitSignals(sigs);
             });
           });
@@ -75,7 +79,7 @@ function hflow_run() {
     rcl.select(dbId, 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); 
+          cb(err, id);
         });
       //});
     });

package.json

@@ -15,7 +15,7 @@
     "ejs": "0.8.4",
     "eyes": "0.1.8",
     "async": "0.2.x",
-    "redis": "0.9.1",
+    "redis": "2.4.2",
     "xml2js": "0.2.7",
     "underscore": "1.x",
     "uuid": "",

server/hyperflow-server.js

@@ -1,7 +1,7 @@
 /*
 ** HyperFlow engine
 ** Author: Bartosz Balis (2012-2014)
-** 
+**
 ** HyperFlow server implementing the REST API for HyperFlow workflows.
 */
 
@@ -11,14 +11,16 @@
  * Module dependencies.
  */
 
+
+var redisURL = process.env.REDIS_URL ? {url: process.env.REDIS_URL} : {};
 // for express
 var express = require('express'),
     cons = require('consolidate'),
     http = require('http'),
     app = express();
 
 var redis = require('redis'),
-    rcl = redis.createClient();
+    rcl = redis.createClient(redisURL);
 
 var server = http.createServer(app);
 var wflib = require('../wflib').init(rcl);
@@ -91,15 +93,15 @@ app.post('/apps', function(req, res) {
     var wfJson = req.body;
     var baseUrl = '';
     //onsole.log(wfJson);
-    
+
     // FIXME: validate workflow description
     // FIXME: add proper/more detailed error info instead of "badRequest(res)"
     wflib.createInstance(wfJson, baseUrl, function(err, appId) {
-        if (err) return badRequest(res); 
+        if (err) return badRequest(res);
         engine[appId] = new Engine({"emulate": "false"}, wflib, appId, function(err) {
-            if (err) return badRequest(res); 
+            if (err) return badRequest(res);
             engine[appId].runInstance(function(err) {
-                if (err) return badRequest(res); 
+                if (err) return badRequest(res);
                 res.header('Location', req.url + '/' + appId);
                 res.send(201, null);
                 //res.redirect(req.url + '/' + appId, 302);
@@ -129,7 +131,7 @@ app.get('/apps/:i', function(req, res) {
             wfname: "Application",
             wfins: appIns,
             wfouts: appOuts,
-            stat: wfInstanceStatus, 
+            stat: wfInstanceStatus,
             now: (new Date()).getTime(),
             submit_inputs_uri: '/apps/'+appId
         }, function(err, html) {
@@ -161,7 +163,7 @@ app.get('/apps/:i', function(req, res) {
 
 // emits a signal to a workflow
 // body must be a valid signal representation, such as:
-// { 
+// {
 //   "name": <signame>
 //   <attr>: <value>
 //   "data": [ sig(s) data ]