From 3fbcf5545919883c00e6d3c284ce5f16b1d7e79b Mon Sep 17 00:00:00 2001 From: "Rafael H. Schloming" Date: Wed, 27 Jan 2010 23:10:59 +0000 Subject: correctly default service attribute git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@903900 13f79535-47bb-0310-9956-ffa450edef68 --- python/qpid/driver.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'python') diff --git a/python/qpid/driver.py b/python/qpid/driver.py index d99ce9d052..8a1776d72c 100644 --- a/python/qpid/driver.py +++ b/python/qpid/driver.py @@ -179,9 +179,7 @@ class Driver: 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 @@ class Driver: 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" -- cgit v1.2.1