diff --git a/ass-stubs/server-test.js b/ass-stubs/server-test.js index 1c3c462..d8f548b 100644 --- a/ass-stubs/server-test.js +++ b/ass-stubs/server-test.js @@ -1,5 +1,5 @@ // We don't require ass because we can't test a majority of the server reliably. //require('ass'); require('../server.js'); -console.log('done'); +console.log('ready'); process.on('SIGTERM', function() { process.exit(0); }); diff --git a/package.json b/package.json index 47fb390..884e7e3 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "es6-promise": "~2.1.0", "request": "~2.55.0", "redis": "~0.12.1", - "camp": "~14.10.12", + "camp": "~15.5.5", "semver": "~4.3.3", "bower": "~1.4.1", "promise": "~7.0.0" diff --git a/server.js b/server.js index b5e45af..fabee5f 100644 --- a/server.js +++ b/server.js @@ -1,10 +1,12 @@ var serverPort = +process.env.PORT || +process.argv[2] || 80; +var bindAddress = process.env.BIND_ADDRESS || process.argv[3] || '127.0.0.1'; var infoSite = process.env.INFOSITE || "http://shields.io"; var camp = require('camp').start({ documentRoot: __dirname, - port: serverPort + port: serverPort, + hostname: bindAddress }); -console.log('http://127.0.0.1:' + serverPort + '/try.html'); +console.log('http://' + bindAddress + ':' + serverPort + '/try.html'); var https = require('https'); var domain = require('domain'); var request = require('request'); diff --git a/test.js b/test.js index 5d88168..5aec33e 100644 --- a/test.js +++ b/test.js @@ -74,7 +74,7 @@ describe('the server', function() { server = cproc.spawn('node', ['ass-stubs/server-test.js', port]); var isDone = false; server.stdout.on('data', function(data) { - if (!isDone) { done(); isDone = true; } + if (data.toString().indexOf('ready') >= 0 && !isDone) { done(); isDone = true; } }); server.stderr.on('data', function(data) { console.log(''+data); }); });