Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(web-server): implement a timeout on webServer.close() #973

Merged
merged 1 commit into from
Apr 1, 2014
Merged

fix(web-server): implement a timeout on webServer.close() #973

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 19 additions & 6 deletions lib/server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,7 @@ var start = function(injector, config, launcher, globalEmitter, preprocess, file
});
}

var webServerCloseTimeout = 3000;
var disconnectBrowsers = function(code) {
// Slightly hacky way of removing disconnect listeners
// to suppress "browser disconnect" warnings
Expand All @@ -199,16 +200,28 @@ var start = function(injector, config, launcher, globalEmitter, preprocess, file
sockets[key].removeAllListeners('disconnect');
});

var removeAllListenersDone = false;
var removeAllListeners = function() {
// make sure we don't execute cleanup twice
if (removeAllListenersDone) {
return;
}
removeAllListenersDone = true;
webServer.removeAllListeners();
processWrapper.removeAllListeners();
done(code || 0);
};

globalEmitter.emitAsync('exit').then(function() {
webServer.close(function() {
webServer.removeAllListeners();
processWrapper.removeAllListeners();
done(code || 0);
});
// shutdown the server...
webServer.close(removeAllListeners);

// ...but don't wait forever on webServer.close() because
// pending client connections prevent it from closing.
setTimeout(removeAllListeners, webServerCloseTimeout);
});
};


try {
processWrapper.on('SIGINT', disconnectBrowsers);
processWrapper.on('SIGTERM', disconnectBrowsers);
Expand Down