qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@apache.org
Subject svn commit: r903900 - /qpid/trunk/qpid/python/qpid/driver.py
Date Wed, 27 Jan 2010 23:10:59 GMT
Author: rhs
Date: Wed Jan 27 23:10:59 2010
New Revision: 903900

URL: http://svn.apache.org/viewvc?rev=903900&view=rev
Log:
correctly default service attribute

Modified:
    qpid/trunk/qpid/python/qpid/driver.py

Modified: qpid/trunk/qpid/python/qpid/driver.py
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/python/qpid/driver.py?rev=903900&r1=903899&r2=903900&view=diff
==============================================================================
--- qpid/trunk/qpid/python/qpid/driver.py (original)
+++ qpid/trunk/qpid/python/qpid/driver.py Wed Jan 27 23:10:59 2010
@@ -179,9 +179,7 @@
     if self.connection.host:
       self._sasl.setAttr("host", self.connection.host)
     options = self.connection.options
-    service = options.get("service", self.connection.host)
-    if service:
-      self._sasl.setAttr("service", service)
+    self._sasl.setAttr("service", options.get("service", "qpidd"))
     if "min_ssf" in options:
       self._sasl.setAttr("minssf", options["min_ssf"])
     if "max_ssf" in options:
@@ -229,9 +227,9 @@
     try:
       data = self._socket.recv(64*1024)
       if data:
+        rawlog.debug("READ[%s]: %r", self.log_id, data)
         if self._sasl_decode:
           data = self._sasl.decode(data)
-        rawlog.debug("READ[%s]: %r", self.log_id, data)
       else:
         rawlog.debug("ABORTED[%s]: %s", self.log_id, self._socket.getpeername())
         error = "connection aborted"



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org


Mime
View raw message