From f18d4e57f9c4cd7f15f28049d19ad2cefd3c98f0 Mon Sep 17 00:00:00 2001 From: Thomas Oettli Date: Thu, 30 Sep 2021 01:17:17 +0200 Subject: [PATCH] cleanup --- pymodmilter/action.py | 3 --- pymodmilter/config.py | 1 + pymodmilter/run.py | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/pymodmilter/action.py b/pymodmilter/action.py index a2bc31a..e82a307 100644 --- a/pymodmilter/action.py +++ b/pymodmilter/action.py @@ -17,7 +17,6 @@ __all__ = ["Action"] import logging from pymodmilter import modify, notify, storage -from pymodmilter.base import CustomLogger from pymodmilter.conditions import Conditions @@ -64,8 +63,6 @@ class Action: def execute(self, milter): """Execute configured action.""" - logger = CustomLogger( - self.logger, {"qid": milter.qid, "name": self.cfg["name"]}) if self.conditions is None or \ self.conditions.match(milter): return self.action.execute(milter) diff --git a/pymodmilter/config.py b/pymodmilter/config.py index 48020f5..7aa1a47 100644 --- a/pymodmilter/config.py +++ b/pymodmilter/config.py @@ -85,6 +85,7 @@ class BaseConfig: def get_config(self): return self._config + class WhitelistConfig(BaseConfig): JSON_SCHEMA = { "type": "object", diff --git a/pymodmilter/run.py b/pymodmilter/run.py index bc93699..3675809 100644 --- a/pymodmilter/run.py +++ b/pymodmilter/run.py @@ -19,7 +19,6 @@ import argparse import json import logging import logging.handlers -import os import re import sys