rda-python-common 3.0.17__tar.gz → 3.0.19__tar.gz

{rda_python_common-3.0.17/src/rda_python_common.egg-info → rda_python_common-3.0.19}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_common
-Version: 3.0.17
+Version: 3.0.19
 Summary: RDA Python common library codes shared by other RDA python packages
 Author-email: Zaihua Ji <zji@ucar.edu>
 Project-URL: Homepage, https://github.com/NCAR/rda-python-common
@@ -189,7 +189,7 @@ PgLOG.pglog("hello", PgLOG.LOGWRN)
 python -c "import rda_python_common; print(rda_python_common.__version__)"
 ```
 
-You should see the installed version (currently `3.0.17`).  If the import
+You should see the installed version (currently `3.0.19`).  If the import
 fails, double-check that the active Python environment is the one where you
 ran `pip install`.
 

{rda_python_common-3.0.17 → rda_python_common-3.0.19}/README.md

@@ -165,7 +165,7 @@ PgLOG.pglog("hello", PgLOG.LOGWRN)
 python -c "import rda_python_common; print(rda_python_common.__version__)"
 ```
 
-You should see the installed version (currently `3.0.17`).  If the import
+You should see the installed version (currently `3.0.19`).  If the import
 fails, double-check that the active Python environment is the one where you
 ran `pip install`.
 

{rda_python_common-3.0.17 → rda_python_common-3.0.19}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "rda_python_common"
-version = "3.0.17"
+version = "3.0.19"
 authors = [
   { name="Zaihua Ji", email="zji@ucar.edu" },
 ]

{rda_python_common-3.0.17 → rda_python_common-3.0.19}/src/rda_python_common/__init__.py

@@ -22,7 +22,7 @@ object that existing callers expect.
 
 from . import PgLOG, PgUtil, PgDBI, PgFile, PgLock, PgCMD, PgSIG, PgOPT, PgSplit
 
-__version__ = "3.0.17"
+__version__ = "3.0.19"
 
 __all__ = [
    "PgLOG",

{rda_python_common-3.0.17 → rda_python_common-3.0.19}/src/rda_python_common/pg_cmd.py

@@ -207,6 +207,14 @@ class PgCMD(PgLock):
             self.pglog(cmsg + "is Running, No restart", self.LOGWRN)
             sys.exit(0)
          if cidx > 0:
+            # a report parked in einfo by the previous run is only mailed by the dscheck
+            # daemon, which skips any record that is already running. restarting the record
+            # here would strand that report until the next run overwrites it, so leave the
+            # record alone and let the daemon mail it first - it clears einfo when it does
+            if pgrec['einfo']:
+               self.pglog(cmsg + "has a report to email, No restart", self.LOGWRN)
+               self.lock_dscheck(cidx, 0, logact)
+               sys.exit(0)
             if not hosts and pgrec['hostname']:
                hosts = pgrec['hostname']
                self.set_one_boption('hostname', hosts, 0)

{rda_python_common-3.0.17 → rda_python_common-3.0.19}/src/rda_python_common/pg_file.py

@@ -105,7 +105,8 @@ class PgFile(PgUtil, PgSIG):
       }
       self.TARSTR = '|'.join(self.PGTARS)
       self.DELDIRS = {}
-      self.TASKIDS = {}   # cache unfinished 
+      self.TASKIDS = {}   # cache unfinished
+      self.QCANCEL = {}   # taskid -> why a task got cancelled, reported by the waiting caller
       self.LHOST = "localhost"
       self.OHOST = self.PGLOG['OBJCTSTR']
       self.BHOST = self.PGLOG['BACKUPNM']
@@ -532,7 +533,11 @@ class PgFile(PgUtil, PgSIG):
                   time.sleep(self.PGSIG['ETIME'])
                   lp += 1
                if task['stat'] == 'S' or task['stat'] == 'A': break
-               if task['stat'] == 'F' and not syserr: break
+               if task['stat'] == 'F' and not syserr:
+                  # nothing waits on this task, so report the cancellation here instead
+                  if task['id'] in self.QCANCEL:
+                     self.errlog("{}: Cancel Task due to {}".format(task['id'], self.QCANCEL.pop(task['id'])), 'B', 1, logact)
+                  break
          errmsg = "Error Execute: " + cmd
          if qstr: errmsg += " with stdin:\n" + qstr
          if syserr:
@@ -581,8 +586,16 @@ class PgFile(PgUtil, PgSIG):
                      detail = ms.group(1)
                      if detail not in astats:
                         if logact&self.NOWAIT:
-                           errmsg = "{}: Cancel Task due to {}:\n{}".format(taskid, detail, buf)
-                           self.errlog(errmsg, 'B', 1, logact)
+                           # record why, and let the caller waiting on this task report it as a
+                           # single error naming the file; dumping the whole get-task output here
+                           # doubled every failure into two error entries, the first 17 lines long
+                           reason = detail
+                           ms = re.search(r'Bytes Transferred:\s+(\d+)', buf)
+                           if ms: reason += " after " + self.format_float_value(ms.group(1))
+                           ms = re.search(r'Files:\s+(\d+)', buf)
+                           if ms: reason += " of {} file(s)".format(ms.group(1))
+                           self.QCANCEL[taskid] = reason
+                           self.pglog("{}: Cancel Task due to {}".format(taskid, reason), self.LOGWRN)
                            ccmd = f"{bcmd} cancel-task {taskid}"
                            self.pgsystem(ccmd, logact, 7)
                         else:
@@ -640,7 +653,10 @@ class PgFile(PgUtil, PgSIG):
                del self.TASKIDS[ckey]
             else:
                status = self.QSTATS[stat] if stat in self.QSTATS else 'UNKNOWN'
-               self.errlog("{}: Status '{}' for Task {}".format(ckey, status, taskid), 'B', 1, logact)
+               errmsg = "{}: Status '{}' for Task {}".format(ckey, status, taskid)
+               if taskid in self.QCANCEL:
+                  errmsg += " - " + self.QCANCEL.pop(taskid)
+               self.errlog(errmsg, 'B', 1, logact)
                ret = self.FAILURE
             break
       return ret

{rda_python_common-3.0.17 → rda_python_common-3.0.19}/src/rda_python_common/pg_log.py

@@ -320,13 +320,18 @@ class PgLOG:
       msg = emlmsg
       for ekey in entries:
          entry = entries[ekey][0]
-         ms = re.search(r'(^|\n)({}: *(.*)\n)'.format(entry), emlmsg, re.I)
+         ms = re.search(r'(^|\n)({}: *(.*)\n)'.format(entry), msg, re.I)
          if ms:
-            vals = ms.groups()
-            msg = msg.replace(vals[1], '')
-            if vals[2]: entries[ekey][2] = vals[2]
+            # cut out this header line only; a replace() of the matched text would also
+            # strip an identical line from anywhere in the message body
+            msg = msg[:ms.start(2)] + msg[ms.end(2):]
+            if ms.group(3): entries[ekey][2] = ms.group(3)
          elif entries[ekey][1]:
             return self.pglog("{}Missing Entry '{}' for sending email".format(logmsg, entry), logact|self.ERRLOG)
+      if not msg.strip():
+         # send_python_email() mails the buffered EMLMSG when it is given no body, which
+         # would send an unrelated message to this recipient and empty the buffer
+         return self.pglog("{}Empty message body for sending email".format(logmsg), logact|self.ERRLOG)
       ret = self.send_python_email(entries['sb'][2], entries['to'][2], msg, entries['fr'][2], entries['cc'][2], logact)
       if ret == self.SUCCESS or not self.PGLOG['EMLSEND']: return ret   
       # try commandline sendmail
@@ -386,7 +391,10 @@ class PgLOG:
             self.PGLOG['EMLMSG'] = ''
          else:
             return ''
-      docc = False if cc else True
+      # only an omitted cc means 'use CCDADDR and carbon copy the sender'; an explicitly
+      # empty cc suppresses the Cc entirely, and used to leak the sender into the global
+      # CCDADDR anyway, carbon copying it on every later email of the same process
+      docc = True if cc is None else False
       if not sender:
          sender = self.PGLOG['CURUID']
          if sender != self.PGLOG['COMMONUSER']: docc = False

{rda_python_common-3.0.17 → rda_python_common-3.0.19/src/rda_python_common.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_common
-Version: 3.0.17
+Version: 3.0.19
 Summary: RDA Python common library codes shared by other RDA python packages
 Author-email: Zaihua Ji <zji@ucar.edu>
 Project-URL: Homepage, https://github.com/NCAR/rda-python-common
@@ -189,7 +189,7 @@ PgLOG.pglog("hello", PgLOG.LOGWRN)
 python -c "import rda_python_common; print(rda_python_common.__version__)"
 ```
 
-You should see the installed version (currently `3.0.17`).  If the import
+You should see the installed version (currently `3.0.19`).  If the import
 fails, double-check that the active Python environment is the one where you
 ran `pip install`.