Changeset 8592

Timestamp:

1 Jun 2012, 12:30:57 (12 years ago)

Author:

Henrik Bettermann

Message:

Search log files in chronological order.

Location:

main/waeup.kofa/trunk/src/waeup/kofa

Files:

• datacenter.py (modified) (2 diffs)
• tests/test_datacenter.py (modified) (2 diffs)

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

@@ -209 +209 @@
             if RE_LOGFILE_BACKUP_NAME.match(name):
                 files.append(name)
-        return sorted(files, key=numerical_suffix)
+        return sorted(files, key=numerical_suffix, reverse=True)
 
     def queryLogfiles(self, basename, query=None, limit=0, start=0):
@@ -220 +220 @@
         All logfiles with name `basename` and maybe some numerical
         extension ('.1', '.2', ...) are searched for the `query` term
-        in correct order. So, if you ask for a basename 'app.log',
-        then any file named 'app.log', 'app.log.1', 'app.log.2',
+        in correct chronological order. So, if you ask for a basename 'app.log',
+        then any file named 'app2.log', 'app.log.1', 'app.log',
         etc. will be searched in that order.
 

main/waeup.kofa/trunk/src/waeup/kofa/tests/test_datacenter.py

@@ -36 +36 @@
         # write 100 messages into logfile, with 50 containing 'Msg'
         path = self.logpath
-        for m in range(num):
+        for m in range(num-1,-1,-1):
             fp = open(path, 'wb')
             for n in range(50*m, 50*m+50):
@@ -62 +62 @@
         # We can find entries in multiple logfiles (backups)
         datacenter = DataCenter()
-        open(self.logpath, 'wb').write('Msg 1\n')
+        open(self.logpath, 'wb').write('Msg 3\n')
         open(self.logpath + '.2', 'wb').write('Msg 2\n')
-        open(self.logpath + '.10', 'wb').write('Msg 3\n')
+        open(self.logpath + '.10', 'wb').write('Msg 1\n')
         result = list(datacenter.queryLogfiles('myapp.log', 'Msg'))
         # entry of logfile .10 comes after entry of logfile .2