Skip to content

Commit

Permalink
cluster: disconnect should not be synchronous
Browse files Browse the repository at this point in the history
Callbacks in node are usually asynchronous, and should never be
sometimes synchronous, and sometimes asynchronous.

Reviewed-by: Trevor Norris <trev.norris@gmail.com>
  • Loading branch information
sam-github authored and trevnorris committed Aug 2, 2014
1 parent 8e2cc69 commit 2fd7ee1
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 2 deletions.
6 changes: 4 additions & 2 deletions lib/cluster.js
Original file line number Diff line number Diff line change
Expand Up @@ -533,8 +533,10 @@ cluster.disconnect = function(callback) {
worker.disconnect();
});

// in case there weren't any workers
progress.check();
process.nextTick(function() {
// in case there weren't any workers
progress.check();
});
};

// Internal function. Called from src/node.js when worker process starts.
Expand Down
36 changes: 36 additions & 0 deletions test/simple/test-cluster-disconnect-with-no-workers.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
// Copyright Joyent, Inc. and other Node contributors.
//
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
// without limitation the rights to use, copy, modify, merge, publish,
// distribute, sublicense, and/or sell copies of the Software, and to permit
// persons to whom the Software is furnished to do so, subject to the
// following conditions:
//
// The above copyright notice and this permission notice shall be included
// in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
// USE OR OTHER DEALINGS IN THE SOFTWARE.

var assert = require('assert');
var cluster = require('cluster');

var disconnected;

process.on('exit', function() {
assert(disconnected);
});

cluster.disconnect(function() {
disconnected = true;
});

// Assert that callback is not sometimes synchronous
assert(!disconnected);

0 comments on commit 2fd7ee1

Please sign in to comment.