bsumgit
diff --git a/‎_img/3c4ce95dcbad1b510cfd4c2ee86d8a35.png
764 Bytes b/‎_img/3c4ce95dcbad1b510cfd4c2ee86d8a35.png
764 Bytes
diff --git a/‎_img/89f8023288762c3383ef0ca36e039944.png
2.79 KB b/‎_img/89f8023288762c3383ef0ca36e039944.png
2.79 KB
diff --git a/‎_img/8ba5b12cebea4a4a081e50e3789a5114.png
5.03 KB b/‎_img/8ba5b12cebea4a4a081e50e3789a5114.png
5.03 KB
diff --git a/‎_img/bc21efaa5981805f4038b3065e15e6b4.png
3.19 KB b/‎_img/bc21efaa5981805f4038b3065e15e6b4.png
3.19 KB
diff --git a/‎python/tutorial-one.md
Lines changed: 107 additions & 52 deletions b/‎python/tutorial-one.md
Lines changed: 107 additions & 52 deletions
@@ -14,14 +14,16 @@ Learning RabbitMQ, part 1 ("Hello world!")
 
 Throughout this tutorial, we'll teach you the basic concepts required for
 creating RabbitMQ applications. The tutorial will be illustrated with
-code snippets written in [Python](http://www.python.org/). But don't worry if
-you don't know this language - the core ideas are the same for other languages.
+code snippets written in [Python](http://www.python.org/) and executed on Linux.
+But don't worry if you don't know this language - the core ideas are the same
+for other languages.
+
 
 This tutorial consists of three parts:
 
  * First we're going to write the simplest possible "Hello World" example.
- * Next we'll try to use Rabbit as a simple "Work queue" server.
- * Finally, we'll discuss the "Publish-subscribe" pattern.
+ * Next we'll try to use Rabbit as [a simple "Work queue" server](http://github.com/rabbitmq/rabbitmq-tutorials/blob/master/python/tutorial-two.md).
+ * Finally, we'll discuss how to [broadcast a message](http://github.com/rabbitmq/rabbitmq-tutorials/blob/master/python/tutorial-three.md).
 
 You need to have RabbitMQ server installed to go through this tutorial.
 If you haven't installed it yet you can follow the
@@ -46,15 +48,16 @@ If you have installed RabbitMQ you should see something like:
 > #### Where to get help
 >
 > If you're having trouble going through this tutorial you can post a message to
-> [rabbitmq-discuss mailing list](https://lists.rabbitmq.com/cgi-bin/mailman/listinfo/rabbitmq-discuss).
+> [rabbitmq-discuss mailing list](https://lists.rabbitmq.com/cgi-bin/mailman/listinfo/rabbitmq-discuss)
+> or join the [#rabbitmq](irc://irc.freenode.net/rabbitmq) irc channel.
 
 
 Introduction
 ------------
 
 RabbitMQ is a message broker. The principle idea is pretty simple: it accepts
 and forwards messages. You can think about it as a post office: when you send
-mail to the post box and you're pretty sure that mr postman will eventually
+mail to the post box and you're pretty sure that Mr. Postman will eventually
 deliver the mail to your recipient. Using this metaphor RabbitMQ is a post box,
 post office and a postman.
 
@@ -65,7 +68,7 @@ blobs of data - _messages_.
 RabbitMQ uses a weird jargon, but it's simple once you'll get it. For example:
 
  * _Producing_ means nothing more than sending. A program that sends messages
-   is a _producer_.
+   is a _producer_. We'll draw it like that, with "P":
 
 
 <center><div class="dot_bitmap">
@@ -79,16 +82,17 @@ RabbitMQ uses a weird jargon, but it's simple once you'll get it. For example:
    is not bound by any limits, it can store how many messages you
    like - it's essentially an infinite buffer. Many _producers_ can send
    messages that go to the one queue, many _consumers_ can try to
-   receive data from one _queue_.
+   receive data from one _queue_. Queue'll be drawn as like that, with
+   its name above it:
 
 
 <center><div class="dot_bitmap">
-<img src="http://github.com/rabbitmq/rabbitmq-tutorials/raw/master/_img/9bdb70c65ab8b2aa1f6b0b85c2931a54.png" alt="Dot graph" width="76" height="29" />
+<img src="http://github.com/rabbitmq/rabbitmq-tutorials/raw/master/_img/3c4ce95dcbad1b510cfd4c2ee86d8a35.png" alt="Dot graph" width="116" height="87" />
 </div></center>
 
 
- * _Consuming_ has a simmilar meaning to receiving. _Consumer_ is a program
-   that mostly waits to receive messages.
+ * _Consuming_ has a similar meaning to receiving. _Consumer_ is a program
+   that mostly waits to receive messages. On our drawings it's shown with "C":
 
 
 <center><div class="dot_bitmap">
@@ -108,26 +112,30 @@ sends a message and one that receives and prints it.
 Our overall design will look like:
 
 <center><div class="dot_bitmap">
-<img src="http://github.com/rabbitmq/rabbitmq-tutorials/raw/master/_img/b3f3e23007aca653c04def0f8e859d18.png" alt="Dot graph" width="363" height="125" />
+<img src="http://github.com/rabbitmq/rabbitmq-tutorials/raw/master/_img/8ba5b12cebea4a4a081e50e3789a5114.png" alt="Dot graph" width="338" height="125" />
 </div></center>
 
 
+Producer sends messages to the "test" queue. The consumer receives
+messages from that queue.
+
 > #### RabbitMQ libraries
 >
 > RabbitMQ speaks AMQP protocol. To use Rabbit you'll need a library that
 > understands the same protocol as Rabbit. There is a choice of libraries
 > for almost every programming language. Python it's not different and there is
 > a bunch of libraries to choose from:
+>
 > * [py-amqplib](http://barryp.org/software/py-amqplib/)
 > * [txAMQP](https://launchpad.net/txamqp)
 > * [pika](http://github.com/tonyg/pika)
 >
 > In this tutorial we're going to use `pika`. To install it you can use
 > [`pip`](http://pip.openplans.org/) package management tool:
 >
->    $ sudo pip install -e git+http://github.com/tonyg/pika.git#egg=pika
+>     $ sudo pip install -e git+http://github.com/tonyg/pika.git#egg=pika
 >
->If you don't have `pip`, you may want to install it.
+> If you don't have `pip`, you may need to install it.
 >
 > * On Ubuntu:
 >
@@ -142,13 +150,14 @@ Our overall design will look like:
 
 
 <center><div class="dot_bitmap">
-<img src="http://github.com/rabbitmq/rabbitmq-tutorials/raw/master/_img/090975cc54ab88a30c0bb4d47611b674.png" alt="Dot graph" width="278" height="125" />
+<img src="http://github.com/rabbitmq/rabbitmq-tutorials/raw/master/_img/89f8023288762c3383ef0ca36e039944.png" alt="Dot graph" width="253" height="125" />
 </div></center>
 
 
 
 Our first program `send.py` will send a single message to the queue.
-The first thing we need to do is connect to RabbitMQ server.
+The first thing we need to do is to establish a connection with
+RabbitMQ server.
 
 <div><pre><code class='python'>#!/usr/bin/env python
 import pika
@@ -159,27 +168,26 @@ connection = pika.AsyncoreConnection(pika.ConnectionParameters(
 channel = connection.channel()</code></pre></div>
 
 
-
-Whenever we send a message we need to make sure the recipient queue exists.
-RabbitMQ will just trash the message if can't deliver it. So, we need to
-create a queue to which the message will be delivered. Let's name this queue
-_test_:
+We're connected now. Next, before sending we need to make sure the
+recipient queue exists. If we send a message to non-existing location,
+RabbitMQ will just trash the message. Let's create a queue to which
+the message will be delivered, let's name it _test_:
 
 <div><pre><code class='python'>channel.queue_declare(queue='test')</code></pre></div>
 
 
 
 At that point we're ready to send a message. Our first message will
-contain a string _Hello World!_ and we want to send it to our _test_
-queue.
+just contain a string _Hello World!_, we want to send it to our
+_test_ queue.
 
-In RabbitMQ a message never goes directly to the queue, it always
+In RabbitMQ a message never can be send directly to the queue, it always
 needs to go through an _exchange_. But let's not get dragged by the
-details - you can read more about _exchanges_ in third part of this
-tutorial. All we need to know now is how to use a default exchange
-identified by an empty string. That exchange is a special one that
+details - you can read more about _exchanges_ in [third part of this
+tutorial](http://github.com/rabbitmq/rabbitmq-tutorials/blob/master/python/tutorial-three.md). All we need to know now is how to use a default exchange
+identified by an empty string. This exchange is special - it
 allows us to specify exactly to which queue the message should go.
-The queue name is specified by the `routing_key` variable:
+The queue name needs to be specified in the `routing_key` parameter:
 
 <div><pre><code class='python'>channel.basic_publish(exchange='',
                       routing_key='test',
@@ -188,42 +196,39 @@ print &quot; [x] Sent 'Hello World!'&quot;</code></pre></div>
 
 
 
-[(full send.py source)](http://github.com/rabbitmq/rabbitmq-tutorials/blob/master/python/send.py)
-
 ### Receiving
 
 
 
 <center><div class="dot_bitmap">
-<img src="http://github.com/rabbitmq/rabbitmq-tutorials/raw/master/_img/e8c961b5097209b7e18281754f6403a4.png" alt="Dot graph" width="278" height="125" />
+<img src="http://github.com/rabbitmq/rabbitmq-tutorials/raw/master/_img/bc21efaa5981805f4038b3065e15e6b4.png" alt="Dot graph" width="253" height="125" />
 </div></center>
 
 
 
 Our second program `receive.py` will receive messages from the queue and print
 them on the screen.
 
-The code responsible for connecting to Rabbit is the same as the previous example.
-You can copy the first 7 lines.
+Again, first we need to connect to RabbitMQ server. The code
+responsible for connecting to Rabbit is the same as previously.
 
-    # ... connection code is the same, copy first 7 lines from send.py ...
-
-Just like before, in the beginning we must make sure that the
-queue exists. Creating a queue using `queue_declare` is idempotent - you can
-run the command as many times you like, and only one queue will be created.
+Next step, just like before, is to make sure that the
+queue exists. Creating a queue using `queue_declare` is idempotent - we can
+run the command as many times you like, and only one will be created.
 
 <div><pre><code class='python'>channel.queue_declare(queue='test')</code></pre></div>
 
 
-You may ask why to declare queue again - we have already declared it
-in our previous code. We could have avoided that if we always run the
-`send.py` program before this one. But we're not sure yet which
+You may ask why to declare the queue again - we have already declared it
+in our previous code. We could have avoided that if we were sure
+that the queue already exists. For example if `send.py` program was
+run before. But we're not yet sure which
 program to run as first. In such case it's a good practice to repeat
 declaring the queue in both programs.
 
 > #### Listing queues
 >
-> Sometimes you may want to see what queues does RabbitMQ store and how many
+> You may want to see what queues does RabbitMQ store and how many
 > messages are in them. You can do it using the `rabbitmqctl` tool:
 >
 >     $ sudo rabbitmqctl list_queues
@@ -233,17 +238,19 @@ declaring the queue in both programs.
 
 
 
-Receiving messages from the queue is a bit more complex. Whenever we receive
-a message, a `callback` function is called. In our case
-this function will print on the screen the contents of the message.
+Receiving messages from the queue is more complex. It works by subscribing
+a `callback` function to a queue. Whenever we receive
+a message, this `callback` function is called by the Pika library.
+In our case this function will print on the screen the contents of
+the message.
 
 <div><pre><code class='python'>def callback(ch, method, header, body):
     print &quot; [x] Received %.20r&quot; % (body,)</code></pre></div>
 
 
 
-Next, we need to tell RabbitMQ that this particular callback function is
-interested in messages from our _test_ queue:
+Next, we need to tell RabbitMQ that this particular callback function should
+receive messages from our _test_ queue:
 
 <div><pre><code class='python'>channel.basic_consume(callback,
                       queue='test',
@@ -254,17 +261,65 @@ For that command to succeed we must be sure that a queue which we want
 to subscribe to exists. Fortunately we're confident about that - we've
 created a queue above - using `queue_declare`.
 
+The `no_ack` parameter will be described [later on](http://github.com/rabbitmq/rabbitmq-tutorials/blob/master/python/tutorial-two.md).
+
 And finally, we enter a never-ending loop that waits for data and runs callbacks
 whenever necessary.
 
 <div><pre><code class='python'>print ' [*] Waiting for messages. To exit press CTRL+C'
 pika.asyncore_loop()</code></pre></div>
 
 
-[(full receive.py source)](http://github.com/rabbitmq/rabbitmq-tutorials/blob/master/python/receive.py)
 
 ### Putting it all together
 
+
+Full code for `send.py`:
+<div><pre><code class='python'>#!/usr/bin/env python
+import pika
+
+connection = pika.AsyncoreConnection(pika.ConnectionParameters(
+        host='127.0.0.1',
+        credentials=pika.PlainCredentials('guest', 'guest')))
+channel = connection.channel()
+
+
+channel.queue_declare(queue='test')
+
+channel.basic_publish(exchange='',
+                      routing_key='test',
+                      body='Hello World!')
+print &quot; [x] Sent 'Hello World!'&quot;</code></pre></div>
+
+[(send.py source)](http://github.com/rabbitmq/rabbitmq-tutorials/blob/master/python/send.py)
+
+
+Full `receive.py` code:
+<div><pre><code class='python'>#!/usr/bin/env python
+import pika
+
+connection = pika.AsyncoreConnection(pika.ConnectionParameters(
+        host='127.0.0.1',
+        credentials=pika.PlainCredentials('guest', 'guest')))
+channel = connection.channel()
+
+
+channel.queue_declare(queue='test')
+
+print ' [*] Waiting for messages. To exit press CTRL+C'
+
+def callback(ch, method, header, body):
+    print &quot; [x] Received %.20r&quot; % (body,)
+
+channel.basic_consume(callback,
+                      queue='test',
+                      no_ack=True)
+
+pika.asyncore_loop()</code></pre></div>
+
+[(receive.py source)](http://github.com/rabbitmq/rabbitmq-tutorials/blob/master/python/receive.py)
+
+
 Now we can try out our programs. First, let's send a message using our
 `send.py` program:
 
@@ -278,10 +333,10 @@ Let's receive it:
      [x] Received 'Hello World!'
 
 Hurray! We were able to send our first message through RabbitMQ. As you might
-have noticed, the `receive.py` program didn't exit. It will stay ready to
-receive further messages. Try to run `send.py` in a new terminal!
+have noticed, the `receive.py` program doesn't exit. It will stay ready to
+receive further messages. Try to run `send.py` again in a new terminal!
 
 We've learned how to send and receive a message from a named
-queue. It's time to move on to part 2 of this tutorial and build a
-simple _task queue_.
+queue. It's time to move on to [part 2](http://github.com/rabbitmq/rabbitmq-tutorials/blob/master/python/tutorial-two.md)
+and build a simple _task queue_.