Mwalker has uploaded a new change for review.
https://gerrit.wikimedia.org/r/130411
Change subject: Use apache style listen syntax
......................................................................
Use apache style listen syntax
Change-Id: I986aa8204abee0716c2469c461d4e8e4b94ccae7
---
M defaults.js
M server.js
2 files changed, 11 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/11/130411/1
diff --git a/defaults.js b/defaults.js
index bcc7d11..2d9ef3a 100644
--- a/defaults.js
+++ b/defaults.js
@@ -1,3 +1,3 @@
module.exports = {
- "port": 8080
-};
\ No newline at end of file
+ listen: "8080"
+};
diff --git a/server.js b/server.js
index 4456aea..3c89d7c 100644
--- a/server.js
+++ b/server.js
@@ -1,7 +1,7 @@
var express = require( 'express' ),
app = express(),
commander = require('commander'),
- server,
+ server, serverConfig,
config = require('./defaults.js');
require('rconsole');
@@ -20,11 +20,16 @@
config = require(commander.config)(config);
}
} catch(err) {
- console.log("Could not open configuration file %s! %s",
commander.config, err);
+ console.err("Could not open configuration file %s! %s",
commander.config, err);
+ process.exit(1);
}
-server = app.listen( config.port, function() {
+serverConfig = /(([0-9\.]*|\[[0-9a-fA-F\:]*\]):)?([0-9]+)/.exec(config.listen);
+if (!serverConfig) {
+ console.err("Server cannot listen on '%s', invalid format.",
config.listen)
+ process.exit(1);
+}
+server = app.listen( serverConfig[3], serverConfig[2], function() {
console.log( 'listening on port %d', server.address().port );
});
-//require commander, rconsole
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/130411
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I986aa8204abee0716c2469c461d4e8e4b94ccae7
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/dash
Gerrit-Branch: master
Gerrit-Owner: Mwalker <mwal...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
