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

cluster: remove bind() and self #7710

Merged
merged 1 commit into from
Jul 15, 2016
Merged

cluster: remove bind() and self #7710

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
34 changes: 16 additions & 18 deletions lib/cluster.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,31 +128,29 @@ function RoundRobinHandle(key, address, port, addressType, backlog, fd) {
else
this.server.listen(address); // UNIX socket path.

var self = this;
this.server.once('listening', function() {
self.handle = self.server._handle;
self.handle.onconnection = self.distribute.bind(self);
self.server._handle = null;
self.server = null;
this.server.once('listening', () => {
this.handle = this.server._handle;
this.handle.onconnection = (err, handle) => this.distribute(err, handle);
this.server._handle = null;
this.server = null;
});
}

RoundRobinHandle.prototype.add = function(worker, send) {
assert(worker.id in this.all === false);
this.all[worker.id] = worker;

var self = this;
function done() {
if (self.handle.getsockname) {
const done = () => {
if (this.handle.getsockname) {
var out = {};
self.handle.getsockname(out);
this.handle.getsockname(out);
// TODO(bnoordhuis) Check err.
send(null, { sockname: out }, null);
} else {
send(null, null, null); // UNIX socket.
}
self.handoff(worker); // In case there are connections pending.
}
this.handoff(worker); // In case there are connections pending.
};

if (this.server === null) return done();
// Still busy binding.
Expand Down Expand Up @@ -194,13 +192,13 @@ RoundRobinHandle.prototype.handoff = function(worker) {
return;
}
var message = { act: 'newconn', key: this.key };
var self = this;
sendHelper(worker.process, message, handle, function(reply) {

sendHelper(worker.process, message, handle, (reply) => {
if (reply.accepted)
handle.close();
else
self.distribute(0, handle); // Worker is shutting down. Send to another.
self.handoff(worker);
this.distribute(0, handle); // Worker is shutting down. Send to another.
this.handoff(worker);
});
};

Expand Down Expand Up @@ -415,7 +413,7 @@ function masterInit() {
cluster.disconnect = function(cb) {
var workers = Object.keys(cluster.workers);
if (workers.length === 0) {
process.nextTick(intercom.emit.bind(intercom, 'disconnect'));
process.nextTick(() => intercom.emit('disconnect'));
} else {
for (var key in workers) {
key = workers[key];
Expand All @@ -437,7 +435,7 @@ function masterInit() {
signo = signo || 'SIGTERM';
var proc = this.process;
if (this.isConnected()) {
this.once('disconnect', proc.kill.bind(proc, signo));
this.once('disconnect', () => proc.kill(signo));
this.disconnect();
return;
}
Expand Down