Fixed socket.io, dronestream clash

Esse commit está contido em:
Andrew Nesbitt
2013-10-02 22:18:17 +01:00
commit 242abe07d1
+4 -1
Ver Arquivo
@@ -1,7 +1,6 @@
var express = require('express') var express = require('express')
, app = express() , app = express()
, server = require('http').createServer(app) , server = require('http').createServer(app)
, io = require('socket.io').listen(server);
app.use(express.static(__dirname + '/public')); app.use(express.static(__dirname + '/public'));
app.use(app.router); app.use(app.router);
@@ -18,6 +17,10 @@ server.listen(8080);
require("dronestream").listen(server); require("dronestream").listen(server);
var io = require('socket.io').listen(server)
io.set('destroy upgrade', false)
io.sockets.on('connection', function(socket) { io.sockets.on('connection', function(socket) {
console.log('connection') console.log('connection')