Revision 9e98ba3c logic/amqp_connection.py

b/logic/amqp_connection.py
31 31
import socket
32 32
from amqplib import client_0_8 as amqp
33 33
from django.conf import settings
34
from synnefo.logic import log
34

  
35
from synnefo.util.log import getLogger
36

  
37

  
38
log = getLogger('synnefo.logic')
35 39

  
36 40
_conn = None
37 41
_chan = None
38
_logger = log.get_logger("amqplib")
42

  
39 43

  
40 44
def _connect():
41 45
    global _conn, _chan
......
51 55
        except socket.error:
52 56
            retry += 1
53 57
            if retry < 5 :
54
                _logger.exception("Cannot establish connection to AMQP. Retrying...")
58
                log.exception("Cannot establish connection to AMQP. Retrying...")
55 59
                time.sleep(1)
56 60
            else:
57 61
                raise AMQPError("Queue error")
......
87 91
                               routing_key=key)
88 92
           return
89 93
        except socket.error as se:
90
           _logger.exception("Server went away, reconnecting...")
94
           log.exception("Server went away, reconnecting...")
91 95
           _connect()
92 96
        except Exception as e:
93 97
            if _conn is None:
94 98
               _connect()
95 99
            else:
96
                _logger.exception('Caught unexpected exception (msg: %s)' % msg)
100
                log.exception('Caught unexpected exception (msg: %s)', msg)
97 101
                raise AMQPError("Error sending message to exchange %s with \
98 102
                                key %s.Payload: %s. Error was: %s",
99 103
                                (exchange, key, payload, e.message))

Also available in: Unified diff