Revision 9c766317 snf-common/synnefo/lib/amqp.py

b/snf-common/synnefo/lib/amqp.py
236 236
                callback(self, result)
237 237
            else:
238 238
                log.debug("Message without body %s" % result)
239
                return
239
                raise socket.error
240 240

  
241 241
        consume_promise = \
242 242
                self.client.basic_consume_multi(queues=queue,
......
261 261
        except (socket.error, puka.spec_exceptions.ConnectionForced):
262 262
            log.debug('Connection closed while receiving messages.')
263 263
            self.consume_promises = []
264
            try:
265
                self.client.close()
266
            except:
267
                pass
264 268
            self.connect()
265 269
            for queues, callback in self.consume_info.items():
266 270
                self.basic_consume(queues, callback)
......
546 550
        except (socket.error, puka.spec_exceptions.ConnectionForced):
547 551
            log.debug('Connection closed while receiving messages.')
548 552
            self.consume_promises = []
553
            try:
554
                self.client.close()
555
            except:
556
                pass
549 557
            self.connect()
550 558
            for queues in self.consume_queues:
551 559
                self.basic_consume(queues)

Also available in: Unified diff