bitinflow/server
1
0
Fork 0
mirror of https://github.com/bitinflow/server.git synced 2026-03-13 13:35:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix upstream client disconnect handling

Browse Source 
When upstream client disconnects, kill any waiting connections. This is
needed to inform the browser that the upstream connection is no longer
available and to close the socket so a new one will be created for new
requests.
This commit is contained in:
Roman Shtylman
2013-11-06 23:06:59 -05:00
parent 0bba03ccd2
commit af2c727b41
1 changed files with 31 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
server.js
View File

@@ -51,13 +51,29 @@ function maybe_bounce(req, res, bounce) {
++stats.requests; ++stats.requests;
res.on('close', function() { res.once('close', function() {
--stats.requests; --stats.requests;
}); });
// get client port // get client port
client.next_socket(function(socket, done) { client.next_socket(function(socket, done) {
var stream = bounce(socket); //, { headers: { connection: 'close' } }); // happens when client upstream is disconnected
// we gracefully inform the user and kill their conn
// without this, the browser will leave some connections open
// and try to use them again for new requests
// we cannot have this as we need bouncy to assign the requests again
if (!socket) {
res.statusCode = 504;
res.end();
req.connection.destroy();
return;
}
var stream = bounce(socket, { headers: { connection: 'close' } });
stream.on('error', function(err) {
socket.destroy();
});
// return the socket to the client pool // return the socket to the client pool
stream.once('end', function() { stream.once('end', function() {
@@ -122,6 +138,7 @@ module.exports = function(opt) {
app.use('/css/widgets.css', makeup(__dirname + '/static/css/widgets.css')); app.use('/css/widgets.css', makeup(__dirname + '/static/css/widgets.css'));
app.use(express.static(__dirname + '/static')); app.use(express.static(__dirname + '/static'));
app.use(app.router); app.use(app.router);
app.get('/', function(req, res, next) { app.get('/', function(req, res, next) {
@@ -143,9 +160,17 @@ module.exports = function(opt) {
}); });
}); });
app.get('/', function(req, res, next) {
return res.render('index');
});
app.get('/:req_id', function(req, res, next) { app.get('/:req_id', function(req, res, next) {
var req_id = req.param('req_id'); var req_id = req.param('req_id');
if (! /[a-z]{4}/.test(req_id)) {
return next();
}
debug('making new client with id %s', req_id); debug('making new client with id %s', req_id);
new_client(req_id, opt, function(err, info) { new_client(req_id, opt, function(err, info) {
if (err) { if (err) {
@@ -160,8 +185,9 @@ module.exports = function(opt) {
}); });
app.get('/', function(req, res, next) { var app_port = 0;
return res.render('index'); var app_server = app.listen(app_port, function() {
app_port = app_server.address().port;
}); });
// connected engine.io sockets for stats updates // connected engine.io sockets for stats updates
@@ -173,7 +199,7 @@ module.exports = function(opt) {
}); });
}, 1000); }, 1000);
var eio_server = new engine.Server(); var eio_server = engine.attach(app_server);
eio_server.on('connection', function (socket) { eio_server.on('connection', function (socket) {
eio_sockets.push(socket); eio_sockets.push(socket);
@@ -189,14 +215,6 @@ module.exports = function(opt) {
}); });
}); });
app.use('/engine.io', function(req, res, next) {
eio_server.handleRequest(req, res);
});
var app_port = 0;
var app_server = app.listen(app_port, function() {
app_port = app_server.address().port;
});
var server = bouncy(function(req, res, bounce) { var server = bouncy(function(req, res, bounce) {
debug('request %s', req.url); debug('request %s', req.url);