Renaming property mailhost into host in class PostfixLogchainInfo.

diff --git a/lib/pp_admintools/handler/pflogparse.py b/lib/pp_admintools/handler/pflogparse.py
index 7f5d5a266f70ed235915bb1b4f8db785881ea557..b01bcd61f131a74e7eac356cfbde9afb90a47247 100644 (file)
--- a/lib/pp_admintools/handler/pflogparse.py
+++ b/lib/pp_admintools/handler/pflogparse.py
@@ -28,7 +28,7 @@ LOG = logging.getLogger(__name__)
 _ = XLATOR.gettext
 ngettext = XLATOR.ngettext
 
-__version__ = '0.5.4'
+__version__ = '0.5.5'
 
 
 # =============================================================================
@@ -190,7 +190,7 @@ class PostfixLogfileParser(HandlingObject):
                 start=entry['timestamp'],
                 postfix_id=entry['postfix_id'],
                 smtpd_pid=pid,
-                mailhost=entry['host'],
+                host=entry['host'],
             )
             self.active_smtpd_pid[pid] = chain
 
@@ -410,7 +410,7 @@ class PostfixLogfileParser(HandlingObject):
                 smtpd_pid=pid,
                 pickup_from=m['from'],
                 pickup_uid=m['uid'],
-                mailhost=host,
+                host=host,
             )
             self.chain[postfix_id] = chain
 

diff --git a/lib/pp_admintools/postfix_chain.py b/lib/pp_admintools/postfix_chain.py
index ebb0a1a917c7dabc9cb2017b9d03525b0edc08bc..a9b11969424918fb47c647e633c839a2ad94ac24 100644 (file)
--- a/lib/pp_admintools/postfix_chain.py
+++ b/lib/pp_admintools/postfix_chain.py
@@ -41,7 +41,7 @@ except ImportError:
 _ = XLATOR.gettext
 ngettext = XLATOR.ngettext
 
-__version__ = '0.8.1'
+__version__ = '0.8.2'
 
 LOG = logging.getLogger(__name__)
 
@@ -830,7 +830,7 @@ class PostfixLogchainInfo(FbGenericBaseObject):
     attributes = (
         'client_host', 'client_addr', 'start', 'end', 'message_id', 'postfix_id', 'ehlo',
         'starttls', 'sent_quit', 'auth', 'commands', 'rcpt', 'data', 'mail', 'from_address',
-        'smtpd_pid', 'mailhost', 'tls_version', 'tls_cipher', 'size', 'nr_rcpt', 'finished',
+        'smtpd_pid', 'host', 'tls_version', 'tls_cipher', 'size', 'nr_rcpt', 'finished',
         'dkim_selector', 'dkim_domain', 'pickup_uid', 'pickup_from',
     )
 
@@ -1216,21 +1216,21 @@ class PostfixLogchainInfo(FbGenericBaseObject):
 
     # -----------------------------------------------------------
     @property
-    def mailhost(self):
-        """Return the name of the mailhost, from where this logchain is originating."""
-        return self._mailhost
+    def host(self):
+        """Return the name of the host, from where this logchain is originating."""
+        return self._host
 
-    @mailhost.setter
-    def mailhost(self, value):
+    @host.setter
+    def host(self, value):
         if value is None:
-            self._mailhost = None
+            self._host = None
             return
 
         val = str(value).strip()
         if val == '':
-            self._mailhost = None
+            self._host = None
             return
-        self._mailhost = val
+        self._host = val
 
     # -----------------------------------------------------------
     @property