Avoid osrm-routed shutdown in After hook

Project-OSRM · Sep 5, 2016 · 6fbfdf1 · 6fbfdf1
1 parent 29e8aa3
commit 6fbfdf1
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 11 deletions.
diff --git a/features/lib/osrm_loader.js b/features/lib/osrm_loader.js
@@ -96,8 +96,11 @@ class OSRMDatastoreLoader extends OSRMBaseLoader {
 
         this.loadData((err) => {
             if (err) return callback(err);
-            if (this.osrmIsRunning()) return callback();
-            else this.launch(callback);
+            if (!this.osrmIsRunning()) this.launch(callback);
+            else {
+                this.scope.setupOutputLog(this.child, fs.createWriteStream(this.scope.scenarioLogFile, {'flags': 'a'}));
+                callback();
+            }
         });
     }
 

diff --git a/features/support/hooks.js b/features/support/hooks.js
@@ -3,6 +3,7 @@
 var d3 = require('d3-queue');
 var path = require('path');
 var mkdirp = require('mkdirp');
+var rimraf = require('rimraf');
 var OSM = require('../lib/osm');
 var OSRMLoader = require('../lib/osrm_loader');
 
@@ -45,15 +46,13 @@ module.exports = function () {
         this.scenarioLogFile = path.join(logDir, this.scenarioID) + '.log';
         d3.queue(1)
             .defer(mkdirp, logDir)
+            .defer(rimraf, this.scenarioLogFile)
             .awaitAll(callback);
     });
 
     this.After((scenario, callback) => {
-        var that = this;
-        this.osrmLoader.shutdown(function() {
-            that.resetOptionsOutput();
-            callback();
-        });
+        this.resetOptionsOutput();
+        callback();
     });
 
     this.AfterFeatures((features, callback) => {

diff --git a/features/support/run.js b/features/support/run.js
@@ -24,6 +24,17 @@ module.exports = function () {
         return opts;
     };
 
+    this.setupOutputLog = (process, log) => {
+        if (process.logFunc) {
+            process.stdout.removeListener('data', process.logFunc);
+            process.stderr.removeListener('data', process.logFunc);
+        }
+
+        process.logFunc = (message) => { log.write(message); };
+        process.stdout.on('data', process.logFunc);
+        process.stderr.on('data', process.logFunc);
+    };
+
     this.runBin = (bin, options, env, callback) => {
         let cmd = util.format('%s%s/%s%s%s', this.QQ, this.BIN_PATH, bin, this.EXE, this.QQ);
         let opts = options.split(' ').filter((x) => { return x && x.length > 0; });
@@ -32,12 +43,10 @@ module.exports = function () {
         // we need to set a large maxbuffer here because we have long running processes like osrm-routed
         // with lots of log output
         let child = child_process.execFile(cmd, opts, {maxBuffer: 1024 * 1024 * 1000, env: env}, callback);
-        child.stdout.on('data', (message) => { log.write(message); });
-        child.stderr.on('data', (message) => { log.write(message); });
         child.on('exit', function(code) {
-            log.write(util.format('*** %s exited with code %d\n', bin, code));
-            log.end();
+            log.end(util.format('*** %s exited with code %d\n', bin, code));
         }.bind(this));
+        this.setupOutputLog(child, log);
         return child;
     };
 };