Merge branch 'master' of https://github.com/tobyfoo/rabbit.js into pr83

squaremo · squaremo · commit 075cd722ac7a · 2015-03-14T15:33:52.000Z
Conflicts:
	index.js
diff --git a/index.js b/index.js
@@ -1,6 +1,6 @@
 var sockets = require('./lib/sockets');
 
 module.exports = sockets;
-module.exports.createContext = function(url) {
-  return new sockets.Context(url);
+module.exports.createContext = function(url, connOpts) {
+  return new sockets.Context(url, connOpts);
 }
diff --git a/lib/sockets.js b/lib/sockets.js
@@ -33,11 +33,11 @@ function errorLater(obj) {
 function ignore() {} // for stubbing out methods I don't care about;
                      // i.e., _read
 
-function Context(url) {
+function Context(url, connOpts) {
   EventEmitter.call(this);
   var self = this;
   var onError = errorLater(this);
-  var c = this._connection = amqp.connect(url);
+  var c = this._connection = amqp.connect(url, connOpts);
   c.then(function(conn) {
     conn.on('error', onError);
     ['close', 'blocked', 'unblocked'].forEach(function(ev) {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`var sockets = require('./lib/sockets');`
`2`	`2`
`3`	`3`	`module.exports = sockets;`
`4`		`-module.exports.createContext = function(url) {`
`5`		`- return new sockets.Context(url);`
	`4`	`+module.exports.createContext = function(url, connOpts) {`
	`5`	`+ return new sockets.Context(url, connOpts);`
`6`	`6`	`}`