These patches clean up comments (some comments mention obsolete API
calls, others mention old file names, etc, this is a quick general scrub
for consistency.)
Jonathan
Index: pubsub/topic_subscriber.py
===================================================================
--- pubsub/topic_subscriber.py (revision 612837)
+++ pubsub/topic_subscriber.py (working copy)
@@ -22,9 +22,9 @@
consumer_tag = queue_name # Use the queue name as the consumer tag - need a unique tag
queue = client.queue(consumer_tag)
- # Call basic_consume() to tell the broker to deliver messages
+ # Call message_subscribe() to tell the broker to deliver messages
# from the AMQP queue to a local client queue. The broker will
- # start delivering messages as soon as basic_consume() is called.
+ # start delivering messages as soon as message_subscribe() is called.
session.message_subscribe(queue=queue_name, destination=consumer_tag)
session.message_flow(consumer_tag, 0, 0xFFFFFFFF)
Index: request-response/client.py
===================================================================
--- request-response/client.py (revision 612837)
+++ request-response/client.py (working copy)
@@ -24,7 +24,7 @@
# Call message_subscribe() to tell the broker to deliver messages
# from the AMQP queue to a local client queue. The broker will
- # start delivering messages as soon as basic_consume() is called.
+ # start delivering messages as soon as message_subscribe() is called.
session.message_subscribe(queue=queue_name, destination=consumer_tag)
session.message_flow(consumer_tag, 0, 0xFFFFFFFF)
Index: request-response/server.py
===================================================================
--- request-response/server.py (revision 612837)
+++ request-response/server.py (working copy)
@@ -38,7 +38,7 @@
client = Client(host, port, qpid.spec.load(amqp_spec))
client.start({"LOGIN": user, "PASSWORD": password})
-# Open Channel 1 so we can use it to manage our queue.
+# Create a session and open it.
session = client.session()
session.session_open()
Index: direct/listener.py
===================================================================
--- direct/listener.py (revision 612837)
+++ direct/listener.py (working copy)
@@ -64,9 +64,9 @@
consumer_tag = "consumer1"
queue = client.queue(consumer_tag)
-# Call message_consume() to tell the broker to deliver messages
+# Call message_subscribe() to tell the broker to deliver messages
# from the AMQP queue to this local client queue. The broker will
-# start delivering messages as soon as message_consume() is called.
+# start delivering messages as soon as message_subscribe() is called.
session.message_subscribe(queue="message_queue", destination=consumer_tag)
session.message_flow(consumer_tag, 0, 0xFFFFFFFF) # Kill these?
Index: direct/declare_queues.py
===================================================================
--- direct/declare_queues.py (revision 612837)
+++ direct/declare_queues.py (working copy)
@@ -1,6 +1,6 @@
#!/usr/bin/env python
"""
- config_direct_exchange.py
+ declare_queues.py
Creates and binds a queue on an AMQP direct exchange.
@@ -33,9 +33,6 @@
#----- Create a queue -------------------------------------
-# Create a queue named "listener" on channel 1, and bind it
-# to the "amq.direct" exchange.
-#
# queue_declare() creates an AMQP queue, which is held
# on the broker. Published messages are sent to the AMQP queue,
# from which messages are delivered to consumers.
Index: fanout/fanout_producer.py
===================================================================
--- fanout/fanout_producer.py (revision 612837)
+++ fanout/fanout_producer.py (working copy)
@@ -1,6 +1,6 @@
#!/usr/bin/env python
"""
- direct_producer.py
+ fanout_producer.py
Publishes messages to an AMQP direct exchange, using
the routing key "routing_key"
Index: fanout/listener.py
===================================================================
--- fanout/listener.py (revision 612837)
+++ fanout/listener.py (working copy)
@@ -1,6 +1,6 @@
#!/usr/bin/env python
"""
- direct_consumer.py
+ listener.py
This AMQP client reads messages from a message
queue named "message_queue".
@@ -63,9 +63,9 @@
consumer_tag = "consumer1"
queue = client.queue(consumer_tag)
-# Call message_consume() to tell the broker to deliver messages
+# Call message_subscribe() to tell the broker to deliver messages
# from the AMQP queue to this local client queue. The broker will
-# start delivering messages as soon as message_consume() is called.
+# start delivering messages as soon as message_subscribe() is called.
session.message_subscribe(queue="message_queue", destination=consumer_tag)
session.message_flow(consumer_tag, 0, 0xFFFFFFFF) # Kill these?
Index: fanout/declare_queues.py
===================================================================
--- fanout/declare_queues.py (revision 612837)
+++ fanout/declare_queues.py (working copy)
@@ -1,6 +1,6 @@
#!/usr/bin/env python
"""
- config_direct_exchange.py
+ declare_queues.py
Creates and binds a queue on an AMQP direct exchange.
@@ -33,9 +33,6 @@
#----- Create a queue -------------------------------------
-# Create a queue named "listener" on channel 1, and bind it
-# to the "amq.fanout" exchange.
-#
# queue_declare() creates an AMQP queue, which is held
# on the broker. Published messages are sent to the AMQP queue,
# from which messages are delivered to consumers.
Index: fanout/fanout_consumer.py
===================================================================
--- fanout/fanout_consumer.py (revision 612837)
+++ fanout/fanout_consumer.py (working copy)
@@ -1,6 +1,6 @@
#!/usr/bin/env python
"""
- direct_consumer.py
+ fanout_consumer.py
This AMQP client reads messages from a message
queue named "message_queue".
@@ -40,9 +40,9 @@
consumer_tag = "consumer1"
queue = client.queue(consumer_tag)
-# Call message_consume() to tell the broker to deliver messages
+# Call message_subscribe() to tell the broker to deliver messages
# from the AMQP queue to this local client queue. The broker will
-# start delivering messages as soon as message_consume() is called.
+# start delivering messages as soon as message_subscribe() is called.
session.message_subscribe(queue="message_queue", destination=consumer_tag)
session.message_flow(consumer_tag, 0, 0xFFFFFFFF)
