[Erp5-report] r26961 - /erp5/trunk/utils/merge_zlogs

[nobody at svn.erp5.org]

Author: jm
Date: Thu May 14 00:10:55 2009
New Revision: 26961

URL: http://svn.erp5.org?rev=26961&view=rev
Log:
Recognize default date formats of Zope and 'logging' module.

Modified:
    erp5/trunk/utils/merge_zlogs

Modified: erp5/trunk/utils/merge_zlogs
URL: http://svn.erp5.org/erp5/trunk/utils/merge_zlogs?rev=26961&r1=26960&r2=26961&view=diff
==============================================================================
--- erp5/trunk/utils/merge_zlogs [utf8] (original)
+++ erp5/trunk/utils/merge_zlogs [utf8] Thu May 14 00:10:55 2009
@@ -1,9 +1,10 @@
 #!/usr/bin/python
-import os.path, sys
+import os.path, re, sys
 
 separator = '------'
 
 class Log(object):
+  date_re = re.compile(r'(\d{4}-\d\d-\d\d)[ T]([0-2]\d(:[0-5]\d){2}(,\d{3})?)')
   def __init__(self, path, prefix):
     if path == '-':
       self.file = sys.stdin
@@ -20,10 +21,10 @@
       elif self.msg:
         break
     if self.msg:
-      for date in self.msg[0].split():
-        if len(date) == 19:
-          self.date = date
-          return True
+      match = self.date_re.match(self.msg[0])
+      if match:
+        self.date = match.group(1), match.group(2)
+        return True
   def write(self):
     print '%s %s\n%s' % (self.prefix, '\n'.join(self.msg), separator)
   def __cmp__(self, other):