rotator/__init__.py

@@ -19,9 +19,7 @@ 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 not prefix:
+            if prefix and prefix not in res:
-                continue
-            if prefix not in res:
                 res[prefix] = set()
             res[prefix].add((os.path.join(root,f), timestamp))
         if not recurse:

rotator/__main__.py

@@ -1,9 +1,7 @@
 import argparse
 import logging
 import logging.handlers
-import os
 import re
-import stat
 import sys
 
 import rotator
@@ -85,23 +83,11 @@ def main():
     handler.setLevel(logging.WARNING)
     log.addHandler(handler)
 
-    handler = None
+    handler = logging.handlers.SysLogHandler(address='/dev/log')
-    for logsocket in ('/var/run/log', '/dev/log'):
+    formatter = logging.Formatter(fmt='rotator[%(process)s] %(message)s')
-        try:
+    handler.setFormatter(formatter)
-            mode = os.stat(logsocket).st_mode
+    handler.setLevel(logging.INFO)
-        except FileNotFoundError:
+    log.addHandler(handler)
-            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()
 

setup.py

@@ -5,7 +5,7 @@ with open('README.md', 'r') as fh:
 
 setuptools.setup(
         name='rotator',
-        version='0.1.1',
+        version='0.1.0',
         author='Fredrik Eriksson',
         author_email='feffe@fulh.ax',
         description='Simple script for rotating backups',