Make sure Bunny tutorials produce the same output as Pika

Author: Michael Klishin

ruby/emit_log.rb

@@ -12,7 +12,7 @@
 msg  = ARGV.empty? ? "Hello World!" : ARGV.join(" ")
 
 x.publish(msg)
-puts " [x] Sent '#{msg}'"
+puts " [x] Sent #{msg}"
 
 sleep 0.5
 conn.close

ruby/new_task.rb

@@ -12,7 +12,7 @@
 msg  = ARGV.empty? ? "Hello World!" : ARGV.join(" ")
 
 q.publish(msg, :persistent => true)
-puts " [x] Published #{msg}"
+puts " [x] Sent #{msg}"
 
 sleep 1.0
 conn.close

ruby/receive.rb

@@ -10,12 +10,10 @@
 q    = ch.queue("hello")
 
 begin
-  puts " [*] Waiting for messages in #{q.name}. To exit press CTRL+C"
+  puts " [*] Waiting for messages. To exit press CTRL+C"
   q.subscribe(:block => true) do |delivery_info, properties, body|
     puts " [x] Received #{body}"
   end
 rescue Interrupt => _
-  puts " [x] Shutting down..."
-
   conn.close
 end

ruby/receive_logs.rb

@@ -19,8 +19,6 @@
     puts " [x] #{body}"
   end
 rescue Interrupt => _
-  puts " [*] Shutting down..."
-
   ch.close
   conn.close
 end

ruby/receive_logs_direct.rb

@@ -22,11 +22,9 @@
 
 begin
   q.subscribe(:block => true) do |delivery_info, properties, body|
-    puts " [x] #{body}"
+    puts " [x] #{delivery_info.routing_key}:#{body}"
   end
 rescue Interrupt => _
-  puts " [*] Shutting down..."
-
   ch.close
   conn.close
 end

ruby/receive_logs_topic.rb

@@ -25,8 +25,6 @@
     puts " [x] #{delivery_info.routing_key}:#{body}"
   end
 rescue Interrupt => _
-  puts " [*] Shutting down..."
-
   ch.close
   conn.close
 end

ruby/rpc_client.rb

@@ -49,14 +49,10 @@ def generate_uuid
 end
 
 
-begin
-  client   = FibonacciClient.new(ch, "rpc_queue")
-  puts " [x] Requesting fib(30). Collecting replies from #{client.reply_queue.name}"
-  response = client.call(30)
-  puts " [.] Got #{response}"
-rescue Interrupt => _
-  puts " [*] Shutting down..."
-
-  ch.close
-  conn.close
-end
+client   = FibonacciClient.new(ch, "rpc_queue")
+puts " [x] Requesting fib(30)"
+response = client.call(30)
+puts " [.] Got #{response}"
+
+ch.close
+conn.close

ruby/rpc_server.rb

@@ -22,8 +22,6 @@ def start(queue_name)
       n = payload.to_i
       r = self.class.fib(n)
 
-      puts " [*] Serving a request: #{n} => #{r}. Replying to #{properties.reply_to}"
-
       @x.publish(r.to_s, :routing_key => properties.reply_to, :correlation_id => properties.correlation_id)
     end
   end
@@ -41,11 +39,9 @@ def self.fib(n)
 
 begin
   server = FibonacciServer.new(ch)
-  puts " [*] Waiting for requests..."
+  " [x] Awaiting RPC requests"
   server.start("rpc_queue")
 rescue Interrupt => _
-  puts " [*] Shutting down..."
-
   ch.close
   conn.close
 end

ruby/worker.rb

@@ -17,9 +17,9 @@
     puts " [x] Received '#{body}'"
     # imitate some work
     sleep 1.0
-
+    puts " [x] Done"
     ch.ack(delivery_info.delivery_tag)
   end
 rescue Interrupt => _
-  puts " [*] Shutting down..."
+  conn.close
 end