adelgado/labeler
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed old debug and added description

Browse source
This commit is contained in:
Antonio J. Delgado 2019-02-18 22:06:28 +01:00
parent 4565b79fdf
commit cd0fa22af5
1 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
labeler.py
View file

@ -1,5 +1,8 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# Label a message (add a header) according to certain rules
# Rules are stored in a file with the format
# field:match:folder:priority
import logging import logging
from logging.handlers import SysLogHandler from logging.handlers import SysLogHandler
@ -21,11 +24,6 @@ handler = RotatingFileHandler('/var/spool/filter/labeler.log', maxBytes=1000000,
formatter = logging.Formatter('%(asctime)s %(name)-12s %(levelname)-8s %(message)s') formatter = logging.Formatter('%(asctime)s %(name)-12s %(levelname)-8s %(message)s')
handler.setFormatter(formatter) handler.setFormatter(formatter)
log.addHandler(handler) log.addHandler(handler)
# handler = logging.StreamHandler()
# formatter = logging.Formatter(
# '%(asctime)s %(name)-12s %(levelname)-8s %(message)s')
# handler.setFormatter(formatter)
# log.addHandler(handler)
log.setLevel(logging.DEBUG) log.setLevel(logging.DEBUG)
log.info('Writing {} bytes of message in /var/spool/filter/last_message.eml...'.format(len(messagecontent))) log.info('Writing {} bytes of message in /var/spool/filter/last_message.eml...'.format(len(messagecontent)))
if not os.path.exists('/var/spool/filter'): if not os.path.exists('/var/spool/filter'):
@ -66,17 +64,13 @@ else:
folder = lrule[2] folder = lrule[2]
priority = lrule[4] priority = lrule[4]
rules.append(lrule) rules.append(lrule)
# log.debug('Checking rule: {}'.format(rule))
if field in headers.keys(): if field in headers.keys():
m = re.search(match, headers[field]) m = re.search(match, headers[field])
if m is None: if m is None:
# log.debug('Header "{}" with value "{}" does NOT match "{}"'.format(lrule[0], headers[lrule[0]], lrule[1]))
a = 1 a = 1
else: else:
msg['X-AD-Label'] = "{}:{}".format(folder, priority) msg['X-AD-Label'] = "{}:{}".format(folder, priority)
log.info('Added label "{}" due to rule "{}"'.format(folder, rule)) log.info('Added label "{}" due to rule "{}"'.format(folder, rule))
# else:
# log.debug('Message does NOT have a header called "{}".'.format(lrule[0]))
messagecontent=msg.as_string() messagecontent=msg.as_string()
if not os.path.exists('/var/spool/filter'): if not os.path.exists('/var/spool/filter'):
log.error('Path /var/spool/filter not found.') log.error('Path /var/spool/filter not found.')