Apply rabbitmq#275, rabbitmq#276 to more Python tutorials

Author: michaelklishin

Diff for: python/receive.py

@@ -8,7 +8,7 @@ def main():
     channel.queue_declare(queue='hello')
 
     def callback(ch, method, properties, body):
-        print(" [x] Received %r" % body)
+        print(" [x] Received %r" % body.decode())
 
     channel.basic_consume(queue='hello', on_message_callback=callback, auto_ack=True)
 

Diff for: python/receive_logs.py

@@ -1,25 +1,34 @@
 #!/usr/bin/env python
-import pika
+import pika, sys, os
 
-connection = pika.BlockingConnection(
-    pika.ConnectionParameters(host='localhost'))
-channel = connection.channel()
+def main():
+    connection = pika.BlockingConnection(
+        pika.ConnectionParameters(host='localhost'))
+    channel = connection.channel()
 
-channel.exchange_declare(exchange='logs', exchange_type='fanout')
+    channel.exchange_declare(exchange='logs', exchange_type='fanout')
 
-result = channel.queue_declare(queue='', exclusive=True)
-queue_name = result.method.queue
+    result = channel.queue_declare(queue='', exclusive=True)
+    queue_name = result.method.queue
 
-channel.queue_bind(exchange='logs', queue=queue_name)
+    channel.queue_bind(exchange='logs', queue=queue_name)
 
-print(' [*] Waiting for logs. To exit press CTRL+C')
+    def callback(ch, method, properties, body):
+        print(" [x] %r" % body.decode())
 
+    print(' [*] Waiting for logs. To exit press CTRL+C')
+    channel.basic_consume(
+        queue=queue_name, on_message_callback=callback, auto_ack=True)
 
-def callback(ch, method, properties, body):
-    print(" [x] %r" % body)
+    channel.start_consuming()
 
 
-channel.basic_consume(
-    queue=queue_name, on_message_callback=callback, auto_ack=True)
-
-channel.start_consuming()
+if __name__ == '__main__':
+    try:
+        main()
+    except KeyboardInterrupt:
+        print('Interrupted')
+        try:
+            sys.exit(0)
+        except SystemExit:
+            os._exit(0)

Diff for: python/receive_logs_direct.py

@@ -1,33 +1,44 @@
 #!/usr/bin/env python
-import pika
-import sys
+import pika, sys, os
 
-connection = pika.BlockingConnection(
+def main():
+    connection = pika.BlockingConnection(
     pika.ConnectionParameters(host='localhost'))
-channel = connection.channel()
+    channel = connection.channel()
 
-channel.exchange_declare(exchange='direct_logs', exchange_type='direct')
+    channel.exchange_declare(exchange='direct_logs', exchange_type='direct')
 
-result = channel.queue_declare(queue='', exclusive=True)
-queue_name = result.method.queue
+    result = channel.queue_declare(queue='', exclusive=True)
+    queue_name = result.method.queue
 
-severities = sys.argv[1:]
-if not severities:
-    sys.stderr.write("Usage: %s [info] [warning] [error]\n" % sys.argv[0])
-    sys.exit(1)
+    severities = sys.argv[1:]
+    if not severities:
+        sys.stderr.write("Usage: %s [info] [warning] [error]\n" % sys.argv[0])
+        sys.exit(1)
 
-for severity in severities:
-    channel.queue_bind(
-        exchange='direct_logs', queue=queue_name, routing_key=severity)
+    for severity in severities:
+        channel.queue_bind(
+            exchange='direct_logs', queue=queue_name, routing_key=severity)
 
-print(' [*] Waiting for logs. To exit press CTRL+C')
+    print(' [*] Waiting for logs. To exit press CTRL+C')
 
 
-def callback(ch, method, properties, body):
-    print(" [x] %r:%r" % (method.routing_key, body))
+    def callback(ch, method, properties, body):
+        print(" [x] %r:%r" % (method.routing_key, body.decode()))
 
 
-channel.basic_consume(
-    queue=queue_name, on_message_callback=callback, auto_ack=True)
+    channel.basic_consume(
+        queue=queue_name, on_message_callback=callback, auto_ack=True)
 
-channel.start_consuming()
+    channel.start_consuming()
+
+
+if __name__ == '__main__':
+    try:
+        main()
+    except KeyboardInterrupt:
+        print('Interrupted')
+        try:
+            sys.exit(0)
+        except SystemExit:
+            os._exit(0)

Diff for: python/receive_logs_topic.py

@@ -1,33 +1,44 @@
 #!/usr/bin/env python
-import pika
-import sys
+import pika, sys, os
 
-connection = pika.BlockingConnection(
+def main():
+    connection = pika.BlockingConnection(
     pika.ConnectionParameters(host='localhost'))
-channel = connection.channel()
+    channel = connection.channel()
 
-channel.exchange_declare(exchange='topic_logs', exchange_type='topic')
+    channel.exchange_declare(exchange='topic_logs', exchange_type='topic')
 
-result = channel.queue_declare(queue='', exclusive=True)
-queue_name = result.method.queue
+    result = channel.queue_declare(queue='', exclusive=True)
+    queue_name = result.method.queue
 
-binding_keys = sys.argv[1:]
-if not binding_keys:
-    sys.stderr.write("Usage: %s [binding_key]...\n" % sys.argv[0])
-    sys.exit(1)
+    binding_keys = sys.argv[1:]
+    if not binding_keys:
+        sys.stderr.write("Usage: %s [binding_key]...\n" % sys.argv[0])
+        sys.exit(1)
 
-for binding_key in binding_keys:
-    channel.queue_bind(
-        exchange='topic_logs', queue=queue_name, routing_key=binding_key)
+    for binding_key in binding_keys:
+        channel.queue_bind(
+            exchange='topic_logs', queue=queue_name, routing_key=binding_key)
 
-print(' [*] Waiting for logs. To exit press CTRL+C')
+    print(' [*] Waiting for logs. To exit press CTRL+C')
 
 
-def callback(ch, method, properties, body):
-    print(" [x] %r:%r" % (method.routing_key, body))
+    def callback(ch, method, properties, body):
+        print(" [x] %r:%r" % (method.routing_key, body.decode()))
 
 
-channel.basic_consume(
-    queue=queue_name, on_message_callback=callback, auto_ack=True)
+    channel.basic_consume(
+        queue=queue_name, on_message_callback=callback, auto_ack=True)
 
-channel.start_consuming()
+    channel.start_consuming()
+
+
+if __name__ == '__main__':
+    try:
+        main()
+    except KeyboardInterrupt:
+        print('Interrupted')
+        try:
+            sys.exit(0)
+        except SystemExit:
+            os._exit(0)