From 2c1d5c17e0efe30d004f92ef9e70f319c9cb594a Mon Sep 17 00:00:00 2001 From: Thomas Oettli Date: Tue, 9 Jun 2020 19:47:47 +0200 Subject: [PATCH] cleanup source --- pymodmilter/actions.py | 8 ++++---- pymodmilter/run.py | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pymodmilter/actions.py b/pymodmilter/actions.py index 668dd7d..ab87f96 100644 --- a/pymodmilter/actions.py +++ b/pymodmilter/actions.py @@ -284,8 +284,6 @@ def add_disclaimer(text, html, action, policy, milter, pretend=False, logger.debug("parse message") msg = fp.close() - text_content = None - html_content = None update_headers = False try: @@ -321,8 +319,10 @@ def add_disclaimer(text, html, action, policy, milter, pretend=False, data = _serialize_msg(msg, logger) update_headers = True except Exception as e: - raise Exception("unable to wrap message in a new message envelope, " - "give up ...") + logger.error(e) + raise Exception( + "unable to wrap message in a new message envelope, " + "give up ...") body_pos = data.find(b"\r\n\r\n") + 4 milter.fp.seek(0) diff --git a/pymodmilter/run.py b/pymodmilter/run.py index 516db59..3bf4f28 100644 --- a/pymodmilter/run.py +++ b/pymodmilter/run.py @@ -105,7 +105,6 @@ def main(): if "global" not in config: config["global"] = {} - if args.debug: loglevel = logging.DEBUG else: