commit a3d53062cf16447d22f049df7a349b32c540bb6d Author: Konstantin Ryabitsev icon@mricon.com Date: Mon Nov 15 14:00:34 2004 +0000
A few uncommitted fixes.
modules/mail_mod.py | 4 ++-- py/epylog/log.py | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) --- diff --git a/modules/mail_mod.py b/modules/mail_mod.py index 44993b8..1dfd772 100644 --- a/modules/mail_mod.py +++ b/modules/mail_mod.py @@ -79,7 +79,7 @@ class mail_mod(InternalModule):
self.sendmail_ident_re = rc('sendmail[\d+]:\s(.*?):') self.sendmail_fromline_re = rc('from=(.*?),.*size=(\d+),.*relay=(.*)') - self.sendmail_ctladdr_re = rc('to=("|.*?),\sctladdr=(.*?),.*stat=(\w+)') + self.sendmail_ctladdr_re = rc('to=("|.*?),\sctladdr=(\S+).*stat=(\w+)') self.sendmail_toline_re = rc('to=(.*?),.*stat=(\w+)') self.sendmail_from_re = rc('(<.*?>)') self.sendmail_relay_re = rc('(.*?)\s[(\S*)]') @@ -276,7 +276,7 @@ class mail_mod(InternalModule):
def _fix_sendmail_address(self, str): try: str = self.sendmail_from_re.search(str).group(1) - except: pass + except: str = '<%s>' % str return str
def _get_top_report(self, rs, descr): diff --git a/py/epylog/log.py b/py/epylog/log.py index 0eba354..07a2557 100644 --- a/py/epylog/log.py +++ b/py/epylog/log.py @@ -841,6 +841,12 @@ class Log: raise epylog.ConfigError(msg, logger) else: rotname = re.sub(re.compile('[|]'), '', self.entry) + ## + # There may not be any rotfiles specified! + # + if rotname == self.entry: + msg = 'No file-rotation data found in "%s"' % self.entry + raise epylog.NoSuchLogError(msg, logger) rotname = re.sub(re.compile('#'), str(ix), rotname) logger.put(5, 'rotname=%s' % rotname) logger.put(5, '<Log._get_rotname_by_ix')