Changeset 8516

Timestamp:

25 May 2012, 02:02:44 (12 years ago)

Author:

uli

Message:

Exclude backup files by default when listing logfiles.

File:

• main/waeup.kofa/trunk/src/waeup/kofa/datacenter.py (modified) (4 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/datacenter.py

@@ -35 +35 @@
 
 #: Regular expression describing a logfile name with backup extension
-RE_LOGFILE_NAME = re.compile('^.+\.\d+$')
+RE_LOGFILE_BACKUP_NAME = re.compile('^.+\.\d+$')
 
 class DataCenter(grok.Container, Logger):
@@ -85 +85 @@
         return result
 
-    def getLogFiles(self):
+    def getLogFiles(self, exclude_backups=True):
         """Get the files from logs/ subdir. Files are sorted by name.
+
+        By default backup logs ('app.log.1', etc.) are excluded.
         """
         result = []
@@ -94 +96 @@
         for name in sorted(os.listdir(logdir)):
             if not os.path.isfile(os.path.join(logdir, name)):
+                continue
+            if exclude_backups == True and RE_LOGFILE_BACKUP_NAME.match(name):
                 continue
             result.append(
@@ -203 +207 @@
         files = [basename,]
         for name in os.listdir(os.path.join(self.storage, 'logs')):
-            if RE_LOGFILE_NAME.match(name):
+            if RE_LOGFILE_BACKUP_NAME.match(name):
                 files.append(name)
         return sorted(files, key=numerical_suffix)