Move hflowStartServer to wfRun.js module

Author: balis

bin/hflow.js

@@ -1,7 +1,5 @@
 #!/usr/bin/env node
 
-var redisURL = process.env.REDIS_URL ? {url: process.env.REDIS_URL} : undefined
-
 var docopt = require('docopt').docopt;
 
 var doc = "\
@@ -25,22 +23,9 @@ if (opts['--submit']) {
     return;
 }
 
-var fs = require('fs'),
-    pathtool = require('path'),
-    redis = require('redis'),
-    rcl = redisURL ? redis.createClient(redisURL): redis.createClient(),
-    wflib = require('../wflib').init(rcl),
-    Engine = require('../engine2'),
-    async = require('async'),
-    AdmZip = require('adm-zip'),
-    dbId = 0,
-    plugins = [],
-    recoveryMode = false, recoveryData = { 'input': [], 'outputs': {}, 'settings': {} },
-    glob = require('glob'),
-    wfDirFull,
-    hflowRun = require('../common/wfRun.js').hflowRun;
+var hflowRun = require('../common/wfRun.js').hflowRun,
+    hflowStartServer = require('../common/wfRun.js').hflowStartServer;
 
-var hfroot = pathtool.join(require('path').dirname(require.main.filename), "..");
 
 // Workflow variables TODO: add support for config files
 
@@ -73,14 +58,6 @@ function hflowSubmit(opts) {
     });
 }
 
-function hflowStartServer() {
-    var server = require('../server/hyperflow-server.js')(rcl, wflib, plugins);
-    let hostname = '127.0.0.1', port = process.env.PORT;
-    server.listen(port,  () => { 
-        console.log("HyperFlow server started, app factory URI: http://%s:%d/apps", server.address().address, server.address().port);
-    });
-}
-
 function hflowSend(opts) {
     console.log("send signal to a workflow: not implemented");
 }

common/wfRun.js

@@ -66,12 +66,16 @@ function handle_writes(entries, cb) {
     });
 }
 
-function hflow_start() {
-    var server = require('../server/hyperflow-server.js')(rcl, wflib, plugins);
-    server.listen(process.env.PORT, function() { });
-    console.log("HyperFlow server started, app factory URI: http://%s:%d/apps", server.address().address, server.address().port);
+function hflowStartServer() {
+    var server = require('../server/hyperflow-server.js')(rcl, wflib);
+    let hostname = '127.0.0.1', port = process.env.PORT;
+    server.listen(port, hostname, () => { 
+        console.log("HyperFlow server started at: http://%s:%d", server.address().address, server.address().port);
+    });
 }
 
+
+
 /*
 ** Function hflowRun: run a workflow
 ** 
@@ -291,4 +295,5 @@ function hflowSend() {
     console.log("send signal to a workflow: not implemented");
 }
 
-exports.hflowRun = hflowRun;
+exports.hflowRun = hflowRun;
+exports.hflowStartServer = hflowStartServer;