Add support for unix domain sockets and systems socket activation.

Author: plietar

coder-base/config.js.default

@@ -1,5 +1,9 @@
-exports.listenIP = null; // All ips
-exports.listenPort = 80;
+// Listen can take different values :
+// - port number
+// - [port number, bind address] array
+// - unix socket path
+// - "systemd" for socket activation
+exports.listen = 80;
 
 exports.cacheApps = true;
 

coder-base/config.js.localhost

@@ -1,5 +1,9 @@
-exports.listenIP = '127.0.0.1';
-exports.httpListenPort = 8080;
+// Listen can take different values :
+// - port number
+// - [port number, bind address] array
+// - unix socket path
+// - "systemd" for socket activation
+exports.listen = [8080, '127.0.0.1'];
 
 exports.cacheApps = true;
 

coder-base/package.json

@@ -14,6 +14,6 @@
         "bcrypt": "~0.7",
         "connect": "~3.0",
         "cookie": "~0.1",
-        "express-params": "0.0.3"
+        "systemd": "git+https://github.com/plietar/node-systemd.git"
     }
 }

coder-base/server.js

@@ -34,6 +34,7 @@ var connect = require('connect');
 var session = require('express-session');
 var bodyParser = require('body-parser');
 var cookieParser = require('cookie-parser');
+var systemd = require('systemd')
 
 global.config = require('./config');
 global.coderlib = require('./apps/coderlib/app');
@@ -234,8 +235,8 @@ var initSocketIO = function( server ) {
 // Allow front end console to receive server logs over a socket connection.
 // Note that util.log will still only go to stdout
 var origlog = console.log;
-console.log = function(d) {
-    origlog.call( console, d );
+console.log = function() {
+    origlog.apply( console, arguments );
     if ( io ) {
         io.set('log level', 1);
         var clients = io.sockets.clients();
@@ -333,12 +334,21 @@ coderapp.all( /^\/app\/(\w+)$/, function( req, res ) { apphandler( req, res,  __
 
 
 var server = http.createServer(coderapp);
-server.listen(config.httpListenPort, config.listenIP);
-initSocketIO(server);
 
-pingStatusServer();
+if (Array.isArray(config.listen))
+    var listenfn = server.listen.bind(server, config.listen[0], config.listen[1]);
+else
+    var listenfn = server.listen.bind(server, config.listen);
 
-process.on('uncaughtException', function(err) {
-    console.log('WARNING: unhandled exception: ' + err );
+listenfn(function() {
+    initSocketIO(server);
+
+    pingStatusServer();
+
+    systemd.notify();
+
+    process.on('uncaughtException', function(err) {
+        console.log('WARNING: unhandled exception: ' + err );
+    });
 });