summaryrefslogtreecommitdiff
path: root/server/index.js
diff options
context:
space:
mode:
authorJules Laplace <jules@okfoc.us>2015-08-05 21:28:20 -0400
committerJules Laplace <jules@okfoc.us>2015-08-05 21:28:20 -0400
commit4514c2c49f0e0ec7cf9911dc254a8d20644d5def (patch)
treeb4ac5caea8dca1cdefebb8873adf9d957ce7ae2a /server/index.js
parent4d6b5e96fbab0602c1781a8b7c06f32aa9d56d99 (diff)
pushing messages into a div
Diffstat (limited to 'server/index.js')
-rw-r--r--server/index.js13
1 files changed, 1 insertions, 12 deletions
diff --git a/server/index.js b/server/index.js
index 1843ae0..96bca33 100644
--- a/server/index.js
+++ b/server/index.js
@@ -13,8 +13,6 @@ var http = require('http'),
ws = require("./ws"),
util = require("./util");
-var websocket = require('./websocket')
-
var app = express()
var server, io
@@ -33,15 +31,6 @@ app.use(express.query())
// app.use(require('express-error-handler'))
// }
-server = http.createServer(app)
-server.listen(app.get('port'), function () {
- console.log('asdf-yt server listening on port ' + app.get('port'));
-})
-
-var io = websocket.init(server)
-
-var rooms = {}
-
app.all('*', function(req, res, next){
res.locals.config = config
next()
@@ -65,4 +54,4 @@ server.listen(app.get('port'), function () {
console.log('asdf-yt server listening on port ' + app.get('port'));
})
-ws.listen(server)
+var io = ws.listen(server)