spacefreak/pyquarantine-milter
1
0
Fork 0
Code Issues Pull Requests Releases Activity

cleanup

Browse Source
This commit is contained in:
Thomas Oettli
2021-09-30 01:17:17 +02:00
parent 08b6ae6377
commit f18d4e57f9
3 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pymodmilter/action.py
View File

@@ -17,7 +17,6 @@ __all__ = ["Action"]
import logging import logging
from pymodmilter import modify, notify, storage from pymodmilter import modify, notify, storage
from pymodmilter.base import CustomLogger
from pymodmilter.conditions import Conditions from pymodmilter.conditions import Conditions
@@ -64,8 +63,6 @@ class Action:
def execute(self, milter): def execute(self, milter):
"""Execute configured action.""" """Execute configured action."""
logger = CustomLogger(
self.logger, {"qid": milter.qid, "name": self.cfg["name"]})
if self.conditions is None or \ if self.conditions is None or \
self.conditions.match(milter): self.conditions.match(milter):
return self.action.execute(milter) return self.action.execute(milter)

1
pymodmilter/config.py
View File

@@ -85,6 +85,7 @@ class BaseConfig:
def get_config(self): def get_config(self):
return self._config return self._config
class WhitelistConfig(BaseConfig): class WhitelistConfig(BaseConfig):
JSON_SCHEMA = { JSON_SCHEMA = {
"type": "object", "type": "object",

1
pymodmilter/run.py
View File

@@ -19,7 +19,6 @@ import argparse
import json import json
import logging import logging
import logging.handlers import logging.handlers
import os
import re import re
import sys import sys