Comment 21 for bug 797770

Here is the actual diff:

--- /usr/share/pyshared/nova/rpc/impl_kombu.py 2012-03-20 07:05:43.000000000 -0400
+++ impl_kombu.py 2012-03-30 15:43:04.821590906 -0400
@@ -440,12 +440,16 @@
         """

         attempt = 0
+
+
+
         while True:
             attempt += 1
             try:
                 self._connect()
                 return
- except self.connection_errors, e:
+ except (self.connection_errors, IOError), e:
+ LOG.debug("Caught %s" % str(e))
                 pass
             except Exception, e:
                 # NOTE(comstud): Unfortunately it's possible for amqplib
@@ -488,7 +492,7 @@
         while True:
             try:
                 return method(*args, **kwargs)
- except (self.connection_errors, socket.timeout), e:
+ except (self.connection_errors, socket.timeout, IOError), e:
                 pass
             except Exception, e:
                 # NOTE(comstud): Unfortunately it's possible for amqplib