diff --git a/chef/lib/chef/index_queue/amqp_client.rb b/chef/lib/chef/index_queue/amqp_client.rb
index <HASH>..<HASH> 100644
--- a/chef/lib/chef/index_queue/amqp_client.rb
+++ b/chef/lib/chef/index_queue/amqp_client.rb
@@ -68,6 +68,7 @@ class Chef
       end
       
       def disconnected!
+        Chef::Log.error("Disconnected from the AMQP Broker (RabbitMQ)")
         @amqp_client = nil
         reset!
       end
@@ -76,12 +77,15 @@ class Chef
         retries = 0
         begin
           exchange.publish({"action" => action.to_s, "payload" => data}.to_json)
-        rescue Bunny::ServerDownError, Bunny::ConnectionError, Errno::ECONNRESET => e
-          Chef::Log.error("Disconnected from the AMQP Broker, cannot queue data to the indexer")
+        rescue Bunny::ServerDownError, Bunny::ConnectionError, Errno::ECONNRESET
           disconnected!
-          retryies += 1
-          retry unless retryies > 1
-          raise e
+          if (retries += 1) < 2
+            Chef::Log.info("Attempting to reconnect to the AMQP broker")
+            retry
+          else
+            Chef::Log.fatal("Could not re-connect to the AMQP broker, giving up")
+            raise
+          end
         end
       end
[CHEF-<I>] fix typos in amqp retry patch