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

fix some stuff

Browse Source
This commit is contained in:
Thomas Oettli
2020-06-09 01:56:35 +02:00
parent 699e76acba
commit 2f8865cd66
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pymodmilter/actions.py
View File

@@ -60,10 +60,10 @@ def add_header(field, value, milter, idx=-1, pretend=False,
def mod_header(field, value, milter, search=None, pretend=False, def mod_header(field, value, milter, search=None, pretend=False,
logger=logging.getLogger(__name__)): logger=logging.getLogger(__name__)):
"""Change the value of a mail header field.""" """Change the value of a mail header field."""
if not isinstance(field, re.Pattern): if isinstance(field, str):
field = re.compile(field, re.IGNORECASE) field = re.compile(field, re.IGNORECASE)
if search is not None and not isinstance(search, re.Pattern): if isinstance(search, str):
search = re.compile(search, re.MULTILINE + re.DOTALL + re.IGNORECASE) search = re.compile(search, re.MULTILINE + re.DOTALL + re.IGNORECASE)
occ = defaultdict(int) occ = defaultdict(int)
@@ -110,10 +110,10 @@ def mod_header(field, value, milter, search=None, pretend=False,
def del_header(field, milter, value=None, pretend=False, def del_header(field, milter, value=None, pretend=False,
logger=logging.getLogger(__name__)): logger=logging.getLogger(__name__)):
"""Delete a mail header field.""" """Delete a mail header field."""
if not isinstance(field, re.Pattern): if isinstance(field, str):
field = re.compile(field, re.IGNORECASE) field = re.compile(field, re.IGNORECASE)
if value is not None and not isinstance(value, re.Pattern): if isinstance(value, str):
value = re.compile(value, re.MULTILINE + re.DOTALL + re.IGNORECASE) value = re.compile(value, re.MULTILINE + re.DOTALL + re.IGNORECASE)
idx = -1 idx = -1

6
pymodmilter/run.py
View File

@@ -105,12 +105,12 @@ def main():
if "global" not in config: if "global" not in config:
config["global"] = {} config["global"] = {}
if "loglevel" not in config["global"]:
config["global"]["loglevel"] = "info"
if args.debug: if args.debug:
loglevel = logging.DEBUG loglevel = logging.DEBUG
else: else:
if "loglevel" not in config["global"]:
config["global"]["loglevel"] = "info"
loglevel = loglevels[config["global"]["loglevel"]] loglevel = loglevels[config["global"]["loglevel"]]
logger.setLevel(loglevel) logger.setLevel(loglevel)
@@ -249,7 +249,7 @@ def main():
logger.info("pymodmilter starting") logger.info("pymodmilter starting")
ModifyMilter.set_rules(rules) ModifyMilter.set_rules(rules)
ModifyMilter.set_loglevel(loglevels[config["global"]["loglevel"]]) ModifyMilter.set_loglevel(loglevel)
# register milter factory class # register milter factory class
Milter.factory = ModifyMilter Milter.factory = ModifyMilter