Commit 90bc7ff5 authored by Leo Iannacone's avatar Leo Iannacone

update to socket.io v1.x

parent acfabe9c
...@@ -19,7 +19,7 @@ var http = require('http'), ...@@ -19,7 +19,7 @@ var http = require('http'),
var app = module.exports = express(), var app = module.exports = express(),
server = http.createServer(app), server = http.createServer(app),
io = require('socket.io').listen(server, config.socket), io = require('socket.io')(server),
env = process.env.NODE_ENV || 'development'; env = process.env.NODE_ENV || 'development';
if ('development' == env) { if ('development' == env) {
......
...@@ -17,9 +17,6 @@ var config = {}; ...@@ -17,9 +17,6 @@ var config = {};
config.host = 'localhost'; config.host = 'localhost';
config.port = 3000; config.port = 3000;
config.socket = {};
config.socket.log = false;
config.debomatic = {}; config.debomatic = {};
config.debomatic.path = '/srv/debomatic-amd64'; config.debomatic.path = '/srv/debomatic-amd64';
config.debomatic.jsonfile = '/var/log/debomatic-json.log'; config.debomatic.jsonfile = '/var/log/debomatic-json.log';
......
...@@ -75,11 +75,7 @@ function __get_files_list(dir, onlyDirectories, callback) { ...@@ -75,11 +75,7 @@ function __get_files_list(dir, onlyDirectories, callback) {
} }
function __watch_path_onsocket(event_name, socket, data, watch_path, updater) { function __watch_path_onsocket(event_name, socket, data, watch_path, updater) {
socket.get('watchers', function (err, socket_watchers) { var socket_watchers = socket.watchers || {};
if (!socket_watchers) {
// init socket watchers
socket_watchers = {};
}
try { try {
var watcher = socket_watchers[event_name]; var watcher = socket_watchers[event_name];
if (watcher) if (watcher)
...@@ -108,13 +104,12 @@ function __watch_path_onsocket(event_name, socket, data, watch_path, updater) { ...@@ -108,13 +104,12 @@ function __watch_path_onsocket(event_name, socket, data, watch_path, updater) {
}); });
} }
socket_watchers[event_name] = watcher; socket_watchers[event_name] = watcher;
socket.set('watchers', socket_watchers); socket.watchers = socket_watchers;
}); });
} catch (err) { } catch (err) {
__errors_handler('__watch_path_onsocket <- ' + arguments.callee.caller.name, err, socket); __errors_handler('__watch_path_onsocket <- ' + arguments.callee.caller.name, err, socket);
return; return;
} }
});
} }
function __generic_handler_watcher(event_name, socket, data, watch_path, callback) { function __generic_handler_watcher(event_name, socket, data, watch_path, callback) {
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
"serve-static": "*", "serve-static": "*",
"errorhandler ": "*", "errorhandler ": "*",
"ejs": ">= 0.0.1", "ejs": ">= 0.0.1",
"socket.io": "0.*", "socket.io": "1.*",
"tail": "*" "tail": "*"
}, },
"scripts": { "scripts": {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment