diff options
author | Marcel Klehr <mklehr@gmx.net> | 2012-09-21 17:12:22 +0200 |
---|---|---|
committer | Marcel Klehr <mklehr@gmx.net> | 2012-09-21 17:12:22 +0200 |
commit | 4416210471e1964d7c30babc354e0e03d1cc00ca (patch) | |
tree | 85b1a39740ad4e21d39c63d584668eab164c50ef /src/node/hooks/express/socketio.js | |
parent | c8b6d3b4f3bb8677b259a8c5be2e9611004347c0 (diff) | |
download | etherpad-lite-4416210471e1964d7c30babc354e0e03d1cc00ca.zip |
Differentiate between http server and express app
Diffstat (limited to 'src/node/hooks/express/socketio.js')
-rw-r--r-- | src/node/hooks/express/socketio.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/node/hooks/express/socketio.js b/src/node/hooks/express/socketio.js index 4f780cb0..9e1a010f 100644 --- a/src/node/hooks/express/socketio.js +++ b/src/node/hooks/express/socketio.js @@ -10,7 +10,7 @@ var connect = require('connect'); exports.expressCreateServer = function (hook_name, args, cb) { //init socket.io and redirect all requests to the MessageHandler - var io = socketio.listen(args.app); + var io = socketio.listen(args.server); /* Require an express session cookie to be present, and load the * session. See http://www.danielbaulig.de/socket-ioexpress for more @@ -62,5 +62,5 @@ exports.expressCreateServer = function (hook_name, args, cb) { socketIORouter.setSocketIO(io); socketIORouter.addComponent("pad", padMessageHandler); - hooks.callAll("socketio", {"app": args.app, "io": io}); + hooks.callAll("socketio", {"app": args.app, "io": io, "server": args.server}); } |