Revision 9c766317

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)
b/snf-cyclades-app/synnefo/logic/callbacks.py
61 61
    """
62 62
    @wraps(func)
63 63
    def wrapper(client, message, *args, **kwargs):
64
        log.debug("Checking if action is required for msg %s",  message)
65

  
66 64
        try:
67 65
            msg = json.loads(message['body'])
68 66

  
......
74 72
            db_time = vm.backendtime
75 73
            if event_time <= db_time:
76 74
                format_ = "%d/%m/%y %H:%M:%S:%f"
77
                log.debug("Ignoring message. event_timestamp: %s db_timestamp: %s",
75
                log.debug("Ignoring message %s.\nevent_timestamp: %s db_timestamp: %s",
76
                          message,
78 77
                          event_time.strftime(format_),
79 78
                          db_time.strftime(format_))
80 79
                client.basic_ack(message)
......
174 173
def dummy_proc(client, message):
175 174
    try:
176 175
        log.debug("Msg: %s", message['body'])
177
        pass
178 176
    except Exception as e:
179 177
        log.exception("Could not receive message")

Also available in: Unified diff