From a7188488cf863793e0632cbf7ed7d308197a5e5c Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Thu, 11 Apr 2024 13:53:44 +0200 Subject: [PATCH] Renaming property mailhost into host in class PostfixLogchainInfo. --- lib/pp_admintools/handler/pflogparse.py | 6 +++--- lib/pp_admintools/postfix_chain.py | 20 ++++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/lib/pp_admintools/handler/pflogparse.py b/lib/pp_admintools/handler/pflogparse.py index 7f5d5a2..b01bcd6 100644 --- 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 ebb0a1a..a9b1196 100644 --- 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 -- 2.39.5