Skip to content

Commit

Permalink
fix(client): clean up create[Sender,Receiver] preconditions, style
Browse files Browse the repository at this point in the history
  • Loading branch information
mbroadst committed Aug 1, 2015
1 parent f29511f commit 5809f68
Showing 1 changed file with 10 additions and 7 deletions.
17 changes: 10 additions & 7 deletions lib/amqp_client.js
Expand Up @@ -229,6 +229,9 @@ AMQPClient.prototype.createSender = function(address, options) {
throw new Error('Must connect before creating links');
}

address = address || this._defaultQueue;
options = options || {};

var linkName = address + '_TX';
var linkPolicy = u.deepMerge({
options: {
Expand Down Expand Up @@ -269,17 +272,11 @@ AMQPClient.prototype.createSender = function(address, options) {

link.on(Link.ErrorReceived, function(err) {
self.emit(AMQPClient.ErrorReceived, err);

self._resolveDeferredSenderAttaches(linkName, err);
reject(err);
});

link.on(Link.Detached, function(details) {
debug('sender link detached: ' + (details ? details.error : 'No details'));
self._attached[linkName] = undefined;

self._resolveDeferredSenderAttaches(linkName, details);
reject(details);
});

// return the attached link
Expand Down Expand Up @@ -321,7 +318,9 @@ AMQPClient.prototype.createSender = function(address, options) {
* @return {Promise}
*/
AMQPClient.prototype.createReceiver = function(address, options) {
if (!this._connection) { throw new Error('Must connect before receiving'); }
if (!this._connection) {
throw new Error('Must connect before creating links');
}

address = address || this._defaultQueue;
options = options || {};
Expand Down Expand Up @@ -375,6 +374,10 @@ AMQPClient.prototype.createReceiver = function(address, options) {
link.removeListener(Link.Attached, onAttached);
self._attached[linkName] = link;

link.on(Link.ErrorReceived, function(err) {
self.emit(AMQPClient.ErrorReceived, err);
});

link.on(Link.Detached, function(details) {
debug('link detached: ' + (details ? details.error : 'No details'));
self._attached[linkName] = undefined;
Expand Down

0 comments on commit 5809f68

Please sign in to comment.