Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Only listen on 127.0.0.1 (unless overriden by environment) during test runs by default.

Browse Source
This commit is contained in:
Daniel Patterson
2018-04-03 16:36:45 -07:00
committed by Patrick Niklaus
parent 649d4ee512
commit eae9e7fab6
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
features/lib/osrm_loader.js
+4 -4
View File
@@ -47,7 +47,7 @@ class OSRMBaseLoader{
if (err) {
if (retryCount < 10) {
retryCount++;
setTimeout(() => { tryConnect(this.scope.OSRM_PORT, retry); }, 10);
setTimeout(() => { tryConnect(this.scope.OSRM_IP, this.scope.OSRM_PORT, retry); }, 10);
} else {
callback(new Error("Could not connect to osrm-routed after ten retries."));
}
@@ -58,7 +58,7 @@ class OSRMBaseLoader{
}
};
tryConnect(this.scope.OSRM_PORT, retry);
tryConnect(this.scope.OSRM_IP, this.scope.OSRM_PORT, retry);
}
};
@@ -77,7 +77,7 @@ class OSRMDirectLoader extends OSRMBaseLoader {
osrmUp (callback) {
if (this.osrmIsRunning()) return callback(new Error("osrm-routed already running!"));
const command_arguments = util.format('%s -p %d -a %s', this.inputFile, this.scope.OSRM_PORT, this.scope.ROUTING_ALGORITHM);
const command_arguments = util.format('%s -p %d -i %s -a %s', this.inputFile, this.scope.OSRM_PORT, this.scope.OSRM_HOST, this.scope.ROUTING_ALGORITHM);
this.child = this.scope.runBin('osrm-routed', command_arguments, this.scope.environment, (err) => {
if (err && err.signal !== 'SIGINT') {
this.child = null;
@@ -116,7 +116,7 @@ class OSRMDatastoreLoader extends OSRMBaseLoader {
osrmUp (callback) {
if (this.osrmIsRunning()) return callback();
const command_arguments = util.format('--shared-memory=1 -p %d -a %s', this.scope.OSRM_PORT, this.scope.ROUTING_ALGORITHM);
const command_arguments = util.format('--shared-memory=1 -i %s -p %d -a %s', this.scope.OSRM_IP, this.scope.OSRM_PORT, this.scope.ROUTING_ALGORITHM);
this.child = this.scope.runBin('osrm-routed', command_arguments, this.scope.environment, (err) => {
if (err && err.signal !== 'SIGINT') {
this.child = null;
features/lib/try_connect.js
+2 -2
View File
@@ -3,8 +3,8 @@
const net = require('net');
const Timeout = require('node-timeout');
module.exports = function tryConnect(port, callback) {
net.connect({ port: port, host: '127.0.0.1' })
module.exports = function tryConnect(host, port, callback) {
net.connect({ port: port, host: host })
.on('connect', () => { callback(); })
.on('error', () => {
callback(new Error('Could not connect.'));