You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rh...@apache.org on 2010/01/19 22:17:38 UTC
svn commit: r900961 - in /qpid/trunk/qpid/python/qpid: driver.py messaging.py
Author: rhs
Date: Tue Jan 19 21:17:36 2010
New Revision: 900961
URL: http://svn.apache.org/viewvc?rev=900961&view=rev
Log:
added connection and session address to log statements
Modified:
qpid/trunk/qpid/python/qpid/driver.py
qpid/trunk/qpid/python/qpid/messaging.py
Modified: qpid/trunk/qpid/python/qpid/driver.py
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/python/qpid/driver.py?rev=900961&r1=900960&r2=900961&view=diff
==============================================================================
--- qpid/trunk/qpid/python/qpid/driver.py (original)
+++ qpid/trunk/qpid/python/qpid/driver.py Tue Jan 19 21:17:36 2010
@@ -133,6 +133,7 @@
def __init__(self, connection):
self.connection = connection
+ self.log_id = "%x" % id(self.connection)
self._lock = self.connection._lock
self._selector = Selector.default()
@@ -198,9 +199,9 @@
try:
data = self._socket.recv(64*1024)
if data:
- rawlog.debug("READ: %r", data)
+ rawlog.debug("READ[%s]: %r", self.log_id, data)
else:
- rawlog.debug("ABORTED: %s", self._socket.getpeername())
+ rawlog.debug("ABORTED[%s]: %s", self.log_id, self._socket.getpeername())
error = "connection aborted"
recoverable = True
except socket.error, e:
@@ -222,7 +223,7 @@
self._op_dec.write(*self._seg_dec.read())
for op in self._op_dec.read():
self.assign_id(op)
- opslog.debug("RCVD: %r", op)
+ opslog.debug("RCVD[%s]: %r", self.log_id, op)
op.dispatch(self)
except VersionError, e:
error = e
@@ -247,7 +248,7 @@
def writeable(self):
try:
n = self._socket.send(self._buf)
- rawlog.debug("SENT: %r", self._buf[:n])
+ rawlog.debug("SENT[%s]: %r", self.log_id, self._buf[:n])
self._buf = self._buf[n:]
except socket.error, e:
self._error(e, True)
@@ -271,7 +272,7 @@
self.connection.error = (err,)
def write_op(self, op):
- opslog.debug("SENT: %r", op)
+ opslog.debug("SENT[%s]: %r", self.log_id, op)
self._op_enc.write(op)
self._seg_enc.write(*self._op_enc.read())
self._frame_enc.write(*self._seg_enc.read())
@@ -825,7 +826,7 @@
if rcv.impending is not UNLIMITED:
assert rcv.received < rcv.impending, "%s, %s" % (rcv.received, rcv.impending)
rcv.received += 1
- log.debug("RECV [%s] %s", ssn, msg)
+ log.debug("RCVD[%s]: %s", ssn.log_id, msg)
ssn.incoming.append(msg)
self.connection._waiter.notifyAll()
Modified: qpid/trunk/qpid/python/qpid/messaging.py
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/python/qpid/messaging.py?rev=900961&r1=900960&r2=900961&view=diff
==============================================================================
--- qpid/trunk/qpid/python/qpid/messaging.py (original)
+++ qpid/trunk/qpid/python/qpid/messaging.py Tue Jan 19 21:17:36 2010
@@ -423,6 +423,7 @@
def __init__(self, connection, name, transactional):
self.connection = connection
self.name = name
+ self.log_id = "%x" % id(self)
self.transactional = transactional
@@ -532,7 +533,7 @@
if msg is not None:
msg._receiver.returned += 1
self.unacked.append(msg)
- log.debug("RETR [%s] %s", self, msg)
+ log.debug("RETR[%s]: %s", self.log_id, msg)
return msg
return None
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org