From a744fe924cef5ca68fea9d7a530cbf9b42b30723 Mon Sep 17 00:00:00 2001 From: Ask Solem Date: Wed, 28 May 2014 14:01:54 +0100 Subject: Hartbeats mess --- Modules/_librabbitmq/connection.c | 5 +++++ librabbitmq/__init__.py | 2 ++ 2 files changed, 7 insertions(+) diff --git a/Modules/_librabbitmq/connection.c b/Modules/_librabbitmq/connection.c index 8cfe3da..a12059e 100644 --- a/Modules/_librabbitmq/connection.c +++ b/Modules/_librabbitmq/connection.c @@ -1215,11 +1215,15 @@ PyRabbitMQ_recv(PyRabbitMQ_Connection *self, PyObject *p, memset(&props, 0, sizeof(props)); + printf("rabbitmq recv\n"); + while (1) { if (!piggyback) { Py_BEGIN_ALLOW_THREADS; amqp_maybe_release_buffers(conn); + printf("+amqp_simple_wait_frame 1\n"); retval = amqp_simple_wait_frame(conn, &frame); + printf("-amqp_simple_wait_frame 1\n"); Py_END_ALLOW_THREADS; if (retval < 0) break; if (frame.frame_type != AMQP_FRAME_METHOD @@ -1328,6 +1332,7 @@ finally: Py_XDECREF(propdict); Py_XDECREF(delivery_info); Py_XDECREF(view); + printf("-rabbitmq recv\n"); return retval; } diff --git a/librabbitmq/__init__.py b/librabbitmq/__init__.py index 1611016..c7430b7 100644 --- a/librabbitmq/__init__.py +++ b/librabbitmq/__init__.py @@ -182,10 +182,12 @@ class Connection(_librabbitmq.Connection): channel_max=channel_max, frame_max=frame_max, heartbeat=heartbeat) + self.channels = {} self._avail_channel_ids = array('H', xrange(self.channel_max, 0, -1)) if not lazy: self.connect() + print('INIT WITH HEARTBEAT: %r' % (self.heartbeat, )) def __enter__(self): return self -- cgit v1.2.1