diff --git a/bin/cloudcmd.js b/bin/cloudcmd.js index 1efeeaf7..4475bedc 100755 --- a/bin/cloudcmd.js +++ b/bin/cloudcmd.js @@ -9,6 +9,7 @@ DIR_LIB = DIR + 'lib/', DIR_SERVER = DIR_LIB + 'server/', + exit = require(DIR_SERVER + 'exit'), config = require(DIR_SERVER + 'config'), createPass = require(DIR_SERVER + 'password'), @@ -167,9 +168,4 @@ require(DIR_LIB + '/server/repl'); } - function exit() { - console.error.apply(console, arguments); - process.exit(1); - } - })(); diff --git a/lib/server.js b/lib/server.js index 7a1dd33c..add0e156 100644 --- a/lib/server.js +++ b/lib/server.js @@ -7,6 +7,7 @@ http = require('http'), middleware = require(DIR_LIB + 'cloudcmd'), + exit = require(DIR_SERVER + 'exit'), config = require(DIR_SERVER + 'config'), express = require(DIR_SERVER + 'express'), io = require('socket.io'); @@ -43,7 +44,7 @@ socket = io.listen(server); server.on('error', function(error) { - console.error('cloudcmd --port: %s', error.message); + exit('cloudcmd --port: %s', error.message); }); middleware.listen(socket); diff --git a/lib/server/exit.js b/lib/server/exit.js new file mode 100644 index 00000000..10e3c433 --- /dev/null +++ b/lib/server/exit.js @@ -0,0 +1,8 @@ +(function() { + 'use strict'; + + module.exports = function() { + console.error.apply(console, arguments); + process.exit(1); + } +})();