From 66c3187318f57b6580b34cf50d1dd1ce6cd5e18f Mon Sep 17 00:00:00 2001 From: Thomas Recouvreux Date: Mon, 19 May 2014 16:22:25 +0200 Subject: [PATCH] examples: Fix samples Fix #11 * Replace `protocol.close_client()` by `protocol.close()` and `protocol.wait_closed()`. * Remove sleeps --- examples/emit_log.py | 5 ++--- examples/emit_log_direct.py | 5 ++--- examples/emit_log_topic.py | 5 ++--- examples/new_task.py | 5 ++--- examples/publisher.py | 4 +++- examples/receive.py | 3 --- examples/receive_log.py | 3 +-- examples/receive_log_direct.py | 3 +-- examples/receive_log_topic.py | 3 +-- 9 files changed, 14 insertions(+), 22 deletions(-) diff --git a/examples/emit_log.py b/examples/emit_log.py index c24f88e..b01f02f 100755 --- a/examples/emit_log.py +++ b/examples/emit_log.py @@ -25,13 +25,12 @@ def exchange_routing(): message = ' '.join(sys.argv[1:]) or "info: Hello World!" yield from channel.exchange(exchange_name, 'fanout') - yield from asyncio.sleep(2) yield from channel.publish(message, exchange_name=exchange_name, routing_key='') print(" [x] Sent %r" % (message,)) - yield from asyncio.sleep(1) - yield from asyncio.wait_for(protocol.client_close(), timeout=10) + protocol.close() + yield from protocol.wait_closed() asyncio.get_event_loop().run_until_complete(exchange_routing()) diff --git a/examples/emit_log_direct.py b/examples/emit_log_direct.py index 03fc600..901c9c5 100755 --- a/examples/emit_log_direct.py +++ b/examples/emit_log_direct.py @@ -25,14 +25,13 @@ def exchange_routing(): message = ' '.join(sys.argv[2:]) or 'Hello World!' yield from channel.exchange(exchange_name, 'direct') - yield from asyncio.sleep(2) yield from channel.publish( message, exchange_name=exchange_name, routing_key=severity) print(" [x] Sent %r" % (message,)) - yield from asyncio.sleep(1) - yield from asyncio.wait_for(protocol.client_close(), timeout=10) + protocol.close() + yield from protocol.wait_closed() asyncio.get_event_loop().run_until_complete(exchange_routing()) diff --git a/examples/emit_log_topic.py b/examples/emit_log_topic.py index a489a3c..5709de8 100755 --- a/examples/emit_log_topic.py +++ b/examples/emit_log_topic.py @@ -25,14 +25,13 @@ def exchange_routing(): routing_key = sys.argv[1] if len(sys.argv) > 1 else 'anonymous.info' yield from channel.exchange(exchange_name, 'topic') - yield from asyncio.sleep(2) yield from channel.publish( message, exchange_name=exchange_name, routing_key=routing_key) print(" [x] Sent %r" % (message,)) - yield from asyncio.sleep(1) - yield from asyncio.wait_for(protocol.client_close(), timeout=10) + protocol.close() + yield from protocol.wait_closed() asyncio.get_event_loop().run_until_complete(exchange_routing()) diff --git a/examples/new_task.py b/examples/new_task.py index ae5dc60..0e4a94a 100755 --- a/examples/new_task.py +++ b/examples/new_task.py @@ -23,13 +23,12 @@ def exchange_routing(): } yield from asyncio.wait_for(channel.queue(queue_name, durable=True), timeout=10) - yield from asyncio.sleep(2) yield from channel.publish("Message ", '', queue_name, properties=message_properties) print(" [x] Sent %r" % (message,)) - yield from asyncio.sleep(1) - yield from asyncio.wait_for(protocol.client_close(), timeout=10) + protocol.close() + yield from protocol.wait_closed() asyncio.get_event_loop().run_until_complete(exchange_routing()) diff --git a/examples/publisher.py b/examples/publisher.py index b02ea11..4349d10 100755 --- a/examples/publisher.py +++ b/examples/publisher.py @@ -23,6 +23,8 @@ def produce(): while True: yield from channel.publish("py3.message", '', queue_name) yield from asyncio.sleep(10) - yield from asyncio.wait_for(protocol.client_close(), timeout=10) + + protocol.close() + yield from protocol.wait_closed() asyncio.get_event_loop().run_until_complete(produce()) diff --git a/examples/receive.py b/examples/receive.py index 57691fc..84e41f6 100644 --- a/examples/receive.py +++ b/examples/receive.py @@ -16,15 +16,12 @@ def receive(): queue_name = 'py2.queue' yield from asyncio.wait_for(channel.queue(queue_name, durable=False, auto_delete=True), timeout=10) - yield from asyncio.sleep(2) yield from asyncio.wait_for(channel.basic_consume(queue_name), timeout=10) while True: consumer_tag, delivery_tag, message = yield from channel.consume() print("consumer {} recved {} ({})".format(consumer_tag, message, delivery_tag)) - yield from asyncio.sleep(10) - yield from asyncio.wait_for(protocol.client_close(), timeout=10) asyncio.get_event_loop().run_until_complete(receive()) diff --git a/examples/receive_log.py b/examples/receive_log.py index 1f256a2..42171b0 100644 --- a/examples/receive_log.py +++ b/examples/receive_log.py @@ -38,7 +38,6 @@ def receive_log(): while True: consumer_tag, delivery_tag, message = yield from channel.consume() print("consumer {} recved {} ({})".format(consumer_tag, message, delivery_tag)) - yield from asyncio.sleep(10) - yield from asyncio.wait_for(protocol.client_close(), timeout=10) + asyncio.get_event_loop().run_until_complete(receive_log()) diff --git a/examples/receive_log_direct.py b/examples/receive_log_direct.py index ccbb0b7..3ae3091 100644 --- a/examples/receive_log_direct.py +++ b/examples/receive_log_direct.py @@ -48,7 +48,6 @@ def receive_log(): while True: consumer_tag, delivery_tag, message = yield from channel.consume() print("consumer {} recved {} ({})".format(consumer_tag, message, delivery_tag)) - yield from asyncio.sleep(10) - yield from asyncio.wait_for(protocol.client_close(), timeout=10) + asyncio.get_event_loop().run_until_complete(receive_log()) diff --git a/examples/receive_log_topic.py b/examples/receive_log_topic.py index ac739ff..d66e2e6 100644 --- a/examples/receive_log_topic.py +++ b/examples/receive_log_topic.py @@ -47,7 +47,6 @@ def receive_log(): while True: consumer_tag, delivery_tag, message = yield from channel.consume() print("consumer {} recved {} ({})".format(consumer_tag, message, delivery_tag)) - yield from asyncio.sleep(10) - yield from asyncio.wait_for(protocol.client_close(), timeout=10) + asyncio.get_event_loop().run_until_complete(receive_log())