summaryrefslogtreecommitdiff
path: root/src/leap
diff options
context:
space:
mode:
authordrebs <drebs@leap.se>2015-04-29 16:11:23 -0300
committerdrebs <drebs@leap.se>2015-04-29 16:11:23 -0300
commit161e72a01ec53a6dae7fe5b4229b478377ca6458 (patch)
tree0664d78cca36f0d04a9e349bc28f9be532691c30 /src/leap
parent9b27a1e81c5ced760d15b65e40fc6a0215231b1c (diff)
parent881cab15bd331c4a8f58d13c0a4e35ebfb324442 (diff)
Merge tag '0.7.0' into debian/platform-0.7
Release Leap MX version 0.7.0. Conflicts: setup.py
Diffstat (limited to 'src/leap')
-rw-r--r--src/leap/mx/alias_resolver.py2
-rw-r--r--src/leap/mx/check_recipient_access.py2
-rw-r--r--src/leap/mx/tcp_map.py2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/leap/mx/alias_resolver.py b/src/leap/mx/alias_resolver.py
index c6f2acc..bf7a58b 100644
--- a/src/leap/mx/alias_resolver.py
+++ b/src/leap/mx/alias_resolver.py
@@ -77,4 +77,4 @@ class AliasResolverFactory(LEAPPostfixTCPMapServerFactory):
@property
def _query_message(self):
- return "Resolving alias for"
+ return "virtual alias map"
diff --git a/src/leap/mx/check_recipient_access.py b/src/leap/mx/check_recipient_access.py
index 55460a6..f994e78 100644
--- a/src/leap/mx/check_recipient_access.py
+++ b/src/leap/mx/check_recipient_access.py
@@ -84,5 +84,5 @@ class CheckRecipientAccessFactory(LEAPPostfixTCPMapServerFactory):
@property
def _query_message(self):
- return "Checking recipient access for"
+ return "check recipient access"
diff --git a/src/leap/mx/tcp_map.py b/src/leap/mx/tcp_map.py
index 597c830..96db70a 100644
--- a/src/leap/mx/tcp_map.py
+++ b/src/leap/mx/tcp_map.py
@@ -66,7 +66,7 @@ class LEAPPostfixTCPMapServerFactory(ServerFactory, object):
and pgp key.
:rtype: Deferred
"""
- log.msg("%s %s" % (self._query_message, lookup_key,))
+ log.msg("%s: %s" % (self._query_message, lookup_key,))
d = self._cdb.getUuidAndPubkey(lookup_key)
d.addErrback(log.err)
return d