Skip to content

[WIP] remove all listeners after error emitting #588

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

Open
jiahuang wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[WIP] remove all listeners after error emitting #588

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
16 changes: 12 additions & 4 deletions src/colony/modules/net.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,29 +468,38 @@ TCPSocket.prototype.__close = function (tryToClose) {
process.removeListener('tcp-close', this._closehandler);

var retries = 0;
function closeSocket(){
function closeSocket(cb){
if (self.socket === null) return;
var ret = tm.tcp_close(self.socket);
if (ret < 0 && ret != -tm.ENOTCONN) { // -57 is inactive, socket has already been closed
if (retries > 3) {
// tried 3 times and couldn't close, error out
self.emit('close');
self.emit('error', new Error('ENOENT Cannot close socket ' + self.socket + ' Got: err'+ret));
cb && cb();
} else {
retries++;
// try again
setTimeout(closeSocket, 100);
setTimeout(function(){
closeSocket(cb);
}, 100);
}

} else {
self.socket = null;
self.emit('close');
cb && cb();
}
}

if (tryToClose !== false) {
closeSocket();
closeSocket(function(){
self.removeAllListeners();
Copy link
Contributor

@rwaldron rwaldron Oct 15, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This doesn't need to wrapped in a callback. Since no other code can reach closeSocket, just close over calls to this.removeAllListeners(); and bind to this (which eliminates the junk self alias binding as well).

});
} else {
self.removeAllListeners();
}

}

TCPSocket.prototype.destroy = TCPSocket.prototype.close = function () {
Expand All @@ -511,7 +520,6 @@ TCPSocket.prototype.destroy = TCPSocket.prototype.close = function () {
self.__close();
}
}
self.removeAllListeners();
});
};

Expand Down