0
@@ -22,7 +22,7 @@ EM.run do
0
   # subscribe to messages from the queue 
0
   queue.subscribe do |headers, msg|
0
     pp [:got, headers, msg]
0
-    EM.stop_event_loop
0
+    AMQP.stop
0
   end
0
   
0
 end

0
@@ -38,8 +38,9 @@ module AMQP
0
           c.close
0
         end
0
       }
0
-      @on_stop = on_stop || proc{
0
+      @on_stop = proc{
0
         @conn = nil
0
+        on_stop.call if on_stop
0
         EM.stop_event_loop if stop_reactor
0
       }
0
     end

0
@@ -56,7 +56,6 @@ class MQ
0
                                             :reply_text => 'bye',
0
                                             :method_id => 0,
0
                                             :class_id => 0)
0
-
0
         } if @closing
0
         succeed
0
 
0
@@ -104,7 +103,14 @@ class MQ
0
   end
0
 
0
   def close
0
-    @closing = true
0
+    if @deferred_status == :succeeded
0
+      send Protocol::Channel::Close.new(:reply_code => 200,
0
+                                        :reply_text => 'bye',
0
+                                        :method_id => 0,
0
+                                        :class_id => 0)
0
+    else
0
+      @closing = true
0
+    end
0
   end
0
 
0
   # keep track of proxy objects