Revision d222936b

b/snf-cyclades-app/synnefo/logic/dispatcher.py
65 65
from synnefo.logic import queues
66 66

  
67 67
import logging
68
import select
69
import errno
68 70

  
69 71
log = logging.getLogger("dispatcher")
70 72
log_amqp = logging.getLogger("amqp")
......
97 99
                                " to a different host. Verify that"
98 100
                                " snf-ganeti-eventd is running!!", timeout)
99 101
                    self.client.reconnect()
100
            except SystemExit:
101
                break
102
            except KeyboardInterrupt:
102
            except select.error as e:
103
                if e[0] != errno.EINTR:
104
                    log.exception("Caught unexpected exception: %s", e)
105
                else:
106
                    break
107
            except (SystemExit, KeyboardInterrupt):
103 108
                break
104 109
            except Exception as e:
105 110
                log.exception("Caught unexpected exception: %s", e)

Also available in: Unified diff