~yolanda.robla/nova/precise-security

« back to all changes in this revision

Viewing changes to nova/rpc/impl_kombu.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2012-04-02 11:17:33 UTC
  • mto: (79.1.1 precise-proposed)
  • mto: This revision was merged to the branch mainline in revision 73.
  • Revision ID: package-import@ubuntu.com-20120402111733-jc0lg7anbrok67q7
Tags: upstream-2012.1~rc2
ImportĀ upstreamĀ versionĀ 2012.1~rc2

Show diffs side-by-side

added added

removed removed

Lines of Context:
445
445
            try:
446
446
                self._connect()
447
447
                return
448
 
            except self.connection_errors, e:
 
448
            except (self.connection_errors, IOError), e:
449
449
                pass
450
450
            except Exception, e:
451
451
                # NOTE(comstud): Unfortunately it's possible for amqplib
488
488
        while True:
489
489
            try:
490
490
                return method(*args, **kwargs)
491
 
            except (self.connection_errors, socket.timeout), e:
 
491
            except (self.connection_errors, socket.timeout, IOError), e:
492
492
                pass
493
493
            except Exception, e:
494
494
                # NOTE(comstud): Unfortunately it's possible for amqplib