Change c25571b broke pools

Author: ask

kombu/connection.py

@@ -731,13 +731,18 @@ def acquire_channel(self, block=False):
         return PoolChannelContext(self, block)
 
     def setup(self):
-        if self.preload:
-            for _ in xrange(self.preload):
-                conn = self.new()
-                conn.connect()
+        if self.limit:
+            for i in xrange(self.limit):
+                if i < self.preload:
+                    conn = self.new()
+                    conn.connect()
+                else:
+                    conn = self.new
                 self._resource.put_nowait(conn)
 
     def prepare(self, resource):
+        if callable(resource):
+            resource = resource()
         resource._debug("acquired")
         return resource
 
@@ -755,9 +760,10 @@ def new(self):
 
     def setup(self):
         channel = self.new()
-        if self.preload:
-            for i in xrange(self.preload):
-                self._resource.put_nowait(channel())
+        if self.limit:
+            for i in xrange(self.limit):
+                self._resource.put_nowait(
+                    i < self.preload and channel() or channel)
 
     def prepare(self, channel):
         if callable(channel):

kombu/pools.py

@@ -20,6 +20,11 @@ def create_producer(self):
     def new(self):
         return lambda: self.create_producer()
 
+    def setup(self):
+        if self.limit:
+            for _ in xrange(self.limit):
+                self._resource.put_nowait(self.new())
+
     def prepare(self, p):
         if callable(p):
             p = p()