Merge lp:~therve/txamqp/worker-gc into lp:txamqp

[Thomas Herve]

[Elliot Murphy (statik)]

This looks good and logical to me. I guess it's deliberate that you don't use yield in the new code, because you want to be sure the errback is added before you yield control? (I'm not so good at twisted, and trying to learn more).

[Esteve Fernandez (esteve)]

review: Approve

=== modified file 'src/txamqp/protocol.py'
--- src/txamqp/protocol.py	2009-05-04 11:12:36 +0000
+++ src/txamqp/protocol.py	2009-06-01 16:35:03 +0000
@@ -266,14 +266,12 @@
         self.sendFrame(frame)
         self.outgoing.get().addCallback(self.writer)
 
-    @defer.inlineCallbacks
     def worker(self, queue):
-        try:
-            yield self.dispatch(queue)
-            queue = yield self.work.get()
-            self.worker(queue)
-        except Exception, e:
-            self.close(e)
+        d = self.dispatch(queue)
+        def cb(ign):
+            self.work.get().addCallback(self.worker)
+        d.addCallback(cb)
+        d.addErrback(self.close)
 
     @defer.inlineCallbacks
     def dispatch(self, queue):