rda-python-metrics 1.0.38__py3-none-any.whl → 1.0.39__py3-none-any.whl

rda_python_metrics/logarch.py

@@ -300,6 +300,7 @@ def append_dssdb_sublog():
 #
 def add_sublog_files(fext, sext, minsize = 0):
 
+   cdate = PgUtil.curdate()
    subname = 'rdaqsub'
    pattern = r'^(\d+)\.'
    afiles = PgFile.local_glob("{}/*.{}".format(subname, fext), 3, PgLOG.LGWNEX)
@@ -314,22 +315,27 @@ def add_sublog_files(fext, sext, minsize = 0):
    for afile in afiles:
       fcnt += 1
       finfo = afiles[afile]
-      sfiles[op.basename(afile)] = "{} {} {}".format(finfo['date_modified'], finfo['time_modified'], finfo['logname'])
+      sfiles[op.basename(afile)] = [finfo['date_modified'], finfo['time_modified'], finfo['logname']]
 
    afiles = sorted(sfiles)
    logfile = "PBS_sublog.{}".format(sext)
    for afile in afiles:
+      ary = sfiles[afile]
       ms = re.match(pattern, afile)
       if ms:
          bid = int(ms.group(1))
-         if bid not in BIDS: BIDS[bid] = PgSIG.check_pbs_process(bid, afile)
+         if bid not in BIDS:
+            if PgUtil.diffdate(cdate, ary[1]) > 6:
+               BIDS[bid] = -1
+            else:
+               BIDS[bid] = PgSIG.check_pbs_process(bid, afile)
          if BIDS[bid] > 0: continue
       else:
          continue
 
       sfile = "{}/{}".format(subname, afile)
       if minsize and PgFile.local_file_size(sfile, 1) < 1: continue
-      PgLOG.pgsystem("echo '{}: {}' >> {}".format(bid, sfiles[afile], logfile), PgLOG.LGWNEX, 5+1024)
+      PgLOG.pgsystem("echo '{}: {} {} {}' >> {}".format(bid, ary[0], ary[1], ary[2], logfile), PgLOG.LGWNEX, 5+1024)
       if PgLOG.pgsystem("cat {} >> {}".format(sfile, logfile), PgLOG.EMEROL, 5+1024):
          PgFile.delete_local_file(sfile, PgLOG.LOGWRN)
          acnt += 1

{rda_python_metrics-1.0.38.dist-info → rda_python_metrics-1.0.39.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_metrics
-Version: 1.0.38
+Version: 1.0.39
 Summary: RDA Python Package to gather and view data usage metrics
 Author-email: Zaihua Ji <zji@ucar.edu>
 Project-URL: Homepage, https://github.com/NCAR/rda-python-metrics

{rda_python_metrics-1.0.38.dist-info → rda_python_metrics-1.0.39.dist-info}/RECORD

@@ -25,7 +25,7 @@ rda_python_metrics/filltdsusage.py,sha256=vOwVzAtWUHO4O-FCSJMg0GKxw-Xc5AzSbfqVFk
 rda_python_metrics/filltdsusage.usg,sha256=yqTHRe8WpZWpu3gso_obgt6LO41-JC27rTIDfdZcISo,538
 rda_python_metrics/filluser.py,sha256=CvaMRaUPaR9nxJAExkLTb3Ci4sD7RQMOpWhWJdbyMF0,8907
 rda_python_metrics/filluser.usg,sha256=Xgqi0QwA9-4jpYj3L4Q4TISpVwRlsomt2G7T0oYAFak,520
-rda_python_metrics/logarch.py,sha256=cs7ArEq9wrHv2SDZMmt02sjW7W_WYc4zo0guggQZm_4,13731
+rda_python_metrics/logarch.py,sha256=xdbdY3_pbM219t0qA_im-bJgQhNYwfdFzqtRWvityAc,13897
 rda_python_metrics/logarch.usg,sha256=6ksFxu_-lzhRpQE2YFAqgGVhwFP4PTweCbFBuGhhICU,960
 rda_python_metrics/pgperson.py,sha256=4XTDnVBFyF9drzx2I_DGCxQ-8I1bpclqTuQvOx3wST4,2088
 rda_python_metrics/pgsyspath.py,sha256=DZhFp-r-LzN0qrHtfdCYfnGDnmD_R4ufuEduk0_vRIw,1039
@@ -50,9 +50,9 @@ rda_python_metrics/viewwebfile.py,sha256=HSMNkQQawonu6W3blV7g9UbJuNy9VAOn9COqgmj
 rda_python_metrics/viewwebfile.usg,sha256=lTNi8Yu8BUJuExEDJX-vsJyWUSUIQTS-DiiBEVFo33s,10054
 rda_python_metrics/viewwebusage.py,sha256=ES2lI8NaCeCpTGi94HU-cDRBxHMiUBbplyYsZf2KqF0,16650
 rda_python_metrics/viewwebusage.usg,sha256=OVDZ78p87E3HLW34ZhasNJ7Zmw8XXjmZPPWZfRhPLXo,9936
-rda_python_metrics-1.0.38.dist-info/licenses/LICENSE,sha256=1dck4EAQwv8QweDWCXDx-4Or0S8YwiCstaso_H57Pno,1097
-rda_python_metrics-1.0.38.dist-info/METADATA,sha256=xOpXA8dmLOGDnjQR-2Ro9XC4W7ZKQORlyPWfMkurfqs,761
-rda_python_metrics-1.0.38.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-rda_python_metrics-1.0.38.dist-info/entry_points.txt,sha256=_Cw8KvtYwxLPt3kLJHwQ1r2swsKKbXk-2zYPZAg2czc,1345
-rda_python_metrics-1.0.38.dist-info/top_level.txt,sha256=aoBgbR_o70TP0QmMW0U6inRHYtfKld47OBmnWnLnDOs,19
-rda_python_metrics-1.0.38.dist-info/RECORD,,
+rda_python_metrics-1.0.39.dist-info/licenses/LICENSE,sha256=1dck4EAQwv8QweDWCXDx-4Or0S8YwiCstaso_H57Pno,1097
+rda_python_metrics-1.0.39.dist-info/METADATA,sha256=KPq_pf5Zt5hSKCWFc0Rir4UWVpc9mC1X8UA3OO0hzhY,761
+rda_python_metrics-1.0.39.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+rda_python_metrics-1.0.39.dist-info/entry_points.txt,sha256=_Cw8KvtYwxLPt3kLJHwQ1r2swsKKbXk-2zYPZAg2czc,1345
+rda_python_metrics-1.0.39.dist-info/top_level.txt,sha256=aoBgbR_o70TP0QmMW0U6inRHYtfKld47OBmnWnLnDOs,19
+rda_python_metrics-1.0.39.dist-info/RECORD,,