Merge pull request #1 from DarkEnergySurvey/condor9updates

Condor9updates

.gitignore

@@ -104,6 +104,7 @@ venv/
 ENV/
 env.bak/
 venv.bak/
+.idea/
 
 # Spyder project settings
 .spyderproject

python/processingfw/pfwcondor.py

@@ -1,8 +1,3 @@
-# $Id: pfwcondor.py 47226 2018-07-12 20:24:15Z friedel $
-# $Rev:: 47226                            $:  # Revision of last commit.
-# $LastChangedBy:: friedel                $:  # Author of last commit.
-# $LastChangedDate:: 2018-07-12 15:24:15 #$:  # Date of last commit.
-
 # pylint: disable=print-statement
 
 """ Utilities for interactions with Condor """
@@ -274,7 +269,13 @@ def write_condor_descfile(jobname, filename, jobattribs, userattribs=None):
 
 def parse_condor_user_log(logfilename):
     """parses a condor log into a dictionary"""
-
+    cversion = int(condor_version().split('.')[0])
+    if cversion == 8:
+        pattern = re.compile(r'(\d+)\s+\((\d+).\d+.\d+\)\s+(\d+\/\d+\s+\d+:\d+:\d+)\s+(.+)')
+    elif cversion == 9:
+        pattern = re.compile(r'(\d+)\s+\((\d+).\d+.\d+\)\s+(\d+-\d+-\d+\s+\d+:\d+:\d+)\s+(.+)')
+    else:
+        raise CondorException(f'Unknown condor version: {cversion}')
     #print "parse_condor_user_log:  logfilename=", logfilename
     log = open(logfilename)
     lines = log.read().split('\n...\n')
@@ -288,17 +289,19 @@ def parse_condor_user_log(logfilename):
     for line in lines:
         if re.search(r'\S', line):
             splitline = line.split('\n')
-            result = re.match(r'(\d+)\s+\((\d+).\d+.\d+\)\s+(\d+\/\d+\s+\d+:\d+:\d+)\s+(.+)',
-                              splitline[0])
+            result = pattern.match(splitline[0])
             if result:
                 code = result.group(1)
                 jobnum = result.group(2)
                 eventtime = result.group(3)
-                eventdate = datetime.strptime(eventtime, '%m/%d %H:%M:%S')
-                if eventdate.month == logmonth:
-                    eventdate = eventdate.replace(year=logyear)
+                if cversion == 8:
+                    eventdate = datetime.strptime(eventtime, '%m/%d %H:%M:%S')
+                    if eventdate.month == logmonth:
+                        eventdate = eventdate.replace(year=logyear)
+                    else:
+                        eventdate = eventdate.replace(year=logyear - 1)
                 else:
-                    eventdate = eventdate.replace(year=logyear - 1)
+                    eventdate = datetime.strptime(eventtime, '%Y-%m-%d %H:%M:%S')
 
                 #desc = result.group(4)