Skip to content

Fix Connection.close on 0.10 upwards #246

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
davedoesdev wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fix Connection.close on 0.10 upwards #246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d31eb50
Fix Connection.close on 0.10
davedoesdev Apr 24, 2014
744211b
Use a single array when closing
davedoesdev Jul 26, 2014
23bd107
Missing semi-colon
davedoesdev Jul 26, 2014
fa4d39f
Merge remote-tracking branch 'upstream/master' into fix-close
davedoesdev Apr 28, 2016
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 lib/cradle.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,10 +170,18 @@ cradle.Connection.prototype.rawRequest = function (options, callback) {
// Close all underlying sockets associated with the agent for the connection.
//
cradle.Connection.prototype.close = function () {
this.agent.sockets.forEach(function (socket) {
socket.end();
});
}
var agentSockets = this.agent.sockets,
sockets = agentSockets.forEach ? agentSockets :
Object.keys(agentSockets).map(function (addr) {
return agentSockets[addr];
}).reduce(function (x, y) {
return x.concat(y);
}, []);

sockets.forEach(function (socket) {
socket.end();
});
};

//
// Connection.request()
Expand Down
3 changes: 3 additions & 0 deletions test/connection-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ vows.describe('cradle/connection').addBatch({
assert.equal(c.options.milk, 'white');
assert.equal(c.options.cache, true);
},
"should be able to close the Connection": function (c) {
c.close();
},
"with just a {} passed to a new Connection object": {
topic: function () { return new(cradle.Connection)({milk: 'green'}) },
"should override the defaults": function (c) {
Expand Down