Improve error handling when running on used port

nsk · Jul 11, 2013 · cff9253 · cff9253
1 parent 3a6cfe5
commit cff9253
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/bin/run.js b/bin/run.js
@@ -1,7 +1,6 @@
 #!/usr/bin/env node
 
-var config = require("../config");
 var startServer = require('../').server.startServer;
 
 // Start server
-startServer(config.port);
+startServer();
diff --git a/lib/server.js b/lib/server.js
@@ -7,8 +7,11 @@ var middleware = require('./middleware');
 
 var socketio = require('socket.io');
 
+var config = require('../config');
 
 function startServer(port) {
+    port = port || config.port;
+
     var app = express();
     var server = app.listen(port);
 
@@ -47,6 +50,11 @@ function startServer(port) {
     // Setup routes
     setupRoutes(app);
 
+    server.on('error', function() {
+        console.error('Could not launch TV.js server on port:', port);
+        process.exit();
+    });
+
     return server;
 }