From 242abe07d1cb3ba716797ab9607ecf70c25218fa Mon Sep 17 00:00:00 2001 From: Andrew Nesbitt Date: Wed, 2 Oct 2013 22:18:17 +0100 Subject: [PATCH] Fixed socket.io, dronestream clash --- server.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/server.js b/server.js index 2110f51..cecb89b 100644 --- a/server.js +++ b/server.js @@ -1,7 +1,6 @@ var express = require('express') , app = express() , server = require('http').createServer(app) - , io = require('socket.io').listen(server); app.use(express.static(__dirname + '/public')); app.use(app.router); @@ -18,6 +17,10 @@ server.listen(8080); require("dronestream").listen(server); +var io = require('socket.io').listen(server) + +io.set('destroy upgrade', false) + io.sockets.on('connection', function(socket) { console.log('connection')