diff options
| author | Rafael H. Schloming <rhs@apache.org> | 2010-01-27 23:10:59 +0000 |
|---|---|---|
| committer | Rafael H. Schloming <rhs@apache.org> | 2010-01-27 23:10:59 +0000 |
| commit | bd2082f8242ba81922bf3b119b8c2da62ae75846 (patch) | |
| tree | c436c37e0fb1df829cc17753ca74844c3d90228f /qpid/python | |
| parent | 028816b02eefb5842c69a0d26496706316d5e4d5 (diff) | |
| download | qpid-python-bd2082f8242ba81922bf3b119b8c2da62ae75846.tar.gz | |
correctly default service attribute
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@903900 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/python')
| -rw-r--r-- | qpid/python/qpid/driver.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/qpid/python/qpid/driver.py b/qpid/python/qpid/driver.py index d99ce9d052..8a1776d72c 100644 --- a/qpid/python/qpid/driver.py +++ b/qpid/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" |