Compare commits
3 Commits
Author | SHA1 | Date | |
---|---|---|---|
4c371cec2b | |||
0708e200c8 | |||
0e61eee899 |
@ -19,7 +19,9 @@ def get_files_in_dir(path, regex, timeformat, recurse=False):
|
||||
for root,dirs,files in os.walk(path, topdown=False):
|
||||
for f in files:
|
||||
prefix, timestamp = parse_filename(f, regex, timeformat)
|
||||
if prefix and prefix not in res:
|
||||
if not prefix:
|
||||
continue
|
||||
if prefix not in res:
|
||||
res[prefix] = set()
|
||||
res[prefix].add((os.path.join(root,f), timestamp))
|
||||
if not recurse:
|
||||
|
@ -1,7 +1,9 @@
|
||||
import argparse
|
||||
import logging
|
||||
import logging.handlers
|
||||
import os
|
||||
import re
|
||||
import stat
|
||||
import sys
|
||||
|
||||
import rotator
|
||||
@ -83,11 +85,23 @@ def main():
|
||||
handler.setLevel(logging.WARNING)
|
||||
log.addHandler(handler)
|
||||
|
||||
handler = logging.handlers.SysLogHandler(address='/dev/log')
|
||||
handler = None
|
||||
for logsocket in ('/var/run/log', '/dev/log'):
|
||||
try:
|
||||
mode = os.stat(logsocket).st_mode
|
||||
except FileNotFoundError:
|
||||
continue
|
||||
|
||||
if stat.S_ISSOCK(mode):
|
||||
handler = logging.handlers.SysLogHandler(address=logsocket)
|
||||
formatter = logging.Formatter(fmt='rotator[%(process)s] %(message)s')
|
||||
handler.setFormatter(formatter)
|
||||
handler.setLevel(logging.INFO)
|
||||
log.addHandler(handler)
|
||||
break
|
||||
|
||||
if not handler:
|
||||
log.warning('No syslog socket found, will not log to syslog')
|
||||
|
||||
args = parse_args()
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user