rda-python-common 1.0.37__py3-none-any.whl → 1.0.39__py3-none-any.whl

rda_python_common/PgLOG.py

@@ -246,12 +246,12 @@ def get_email():
 #
 #  send a customized email with all entries included
 #
-def send_customized_email(logmsg, emlmsg, logact = 0):
+def send_customized_email(logmsg, emlmsg, logact = LOGWRN):
 
    entries = {
       'fr' : ["From",    1, None],
       'to' : ["To",      1, None],
-      'cc' : ["Cc",      0, None],
+      'cc' : ["Cc",      0, ''],
       'sb' : ["Subject", 1, None]
    }
 
@@ -267,18 +267,20 @@ def send_customized_email(logmsg, emlmsg, logact = 0):
          vals = ms.groups()
          msg = msg.replace(vals[1], '')
          if vals[2]: entries[ekey][2] = vals[2]
-      elif logact and entries[ekey][1]:
+      elif entries[ekey][1]:
          return pglog("{}Missing Entry '{}' for sending email".format(logmsg, entry), logact|ERRLOG)
 
-   ret = send_python_email(entries['sb'][2], entries['to'][2], msg, entries['fr'][2], entries['cc'][2])
-   if ret != SUCCESS and PGLOG['EMLSEND']: ret = pgsystem(PGLOG['EMLSEND'], logact, 4, emlmsg)
+   ret = send_python_email(entries['sb'][2], entries['to'][2], msg, entries['fr'][2], entries['cc'][2], logact)
+   if ret == SUCCESS or not PGLOG['EMLSEND']: return ret
 
+   # try commandline sendmail
+   ret = pgsystem(PGLOG['EMLSEND'], logact, 4, emlmsg)
    logmsg += "Email " + entries['to'][2]
    if entries['cc'][2]: logmsg += " Cc'd " + entries['cc'][2]
    logmsg += " Subject: " + entries['sb'][2]
-   if ret:      
+   if ret:
       log_email(emlmsg)
-      if logact: pglog(logmsg, logact&(~EXITLG))
+      pglog(logmsg, logact&(~EXITLG))
    else:
       errmsg = "Error sending email: " + logmsg
       pglog(errmsg, (logact|ERRLOG)&~EXITLG)
@@ -288,14 +290,15 @@ def send_customized_email(logmsg, emlmsg, logact = 0):
 #
 #  send an email; if empty msg send email message saved in PGLOG['EMLMSG'] instead
 #
-def send_email(subject = None, receiver = None, msg = None, sender = None, logact = 0):
+def send_email(subject = None, receiver = None, msg = None, sender = None, logact = LOGWRN):
 
    return send_python_email(subject, receiver, msg, sender, None, logact)
 
 #
-#  send an email via python module smtplib; if empty msg send email message saved in PGLOG['EMLMSG'] instead
+#  send an email via python module smtplib; if empty msg send email message saved
+#  in PGLOG['EMLMSG'] instead. pass cc = '' for skipping 'Cc: '
 #
-def send_python_email(subject = None, receiver = None, msg = None, sender = None, cc = None, logact = 0):
+def send_python_email(subject = None, receiver = None, msg = None, sender = None, cc = None, logact = LOGWRN):
 
    if not msg:
       if PGLOG['EMLMSG']:
@@ -321,7 +324,7 @@ def send_python_email(subject = None, receiver = None, msg = None, sender = None
    emlmsg['From'] = sender
    emlmsg['To'] = receiver
    logmsg = "Email " + receiver
-   if not cc: cc = PGLOG['CCDADDR']
+   if cc == None: cc = PGLOG['CCDADDR']
    if cc:
       emlmsg['Cc'] = cc
       logmsg += " Cc'd " + cc
@@ -339,7 +342,7 @@ def send_python_email(subject = None, receiver = None, msg = None, sender = None
    finally:
       eml.quit()
       log_email(str(emlmsg))
-      if logact: pglog(logmsg, logact&~EXITLG)
+      pglog(logmsg, logact&~EXITLG)
       return SUCCESS
 
 #
@@ -414,7 +417,7 @@ def pglog(msg, logact = MSGLOG):
    if logact&EMLALL:
       if logact&SNDEML or not msg:
          title = (msg if msg else "Message from {}-{}".format(PGLOG['HOSTNAME'], get_command()))
-         msg = title + '\n' + msg
+         msg = title
          send_email(title.rstrip())
       elif msg:
          set_email(msg, logact)

rda_python_common/PgOPT.py

@@ -1682,8 +1682,10 @@ def send_request_email_notice(pgrqst, errmsg, fcount, rstat, readyfile = None, p
       einfo['GLOBUS_TASK_URL'] = "https://app.globus.org/activity/" + pgrqst['task_id']
 
    for ekey in einfo:
-      ebuf = re.sub(r'<{}>'.format(ekey), einfo[ekey], ebuf)
-
+      if ekey == 'CCD' and not einfo['CCD']:
+         ebuf = re.sub(r'Cc:\s*<CCD>\s*', '', ebuf)
+      else:
+         ebuf = re.sub(r'<{}>'.format(ekey), einfo[ekey], ebuf)
 
    if PgLOG.PGLOG['DSCHECK'] and not pgpart:
       tbl = "dscheck"

{rda_python_common-1.0.37.dist-info → rda_python_common-1.0.39.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_common
-Version: 1.0.37
+Version: 1.0.39
 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

{rda_python_common-1.0.37.dist-info → rda_python_common-1.0.39.dist-info}/RECORD

@@ -1,15 +1,15 @@
 rda_python_common/PgCMD.py,sha256=EYjG2Z4zEnvsXE1z-jt5UaNoEKxnOYYiMMzvW6HrKA4,20597
 rda_python_common/PgDBI.py,sha256=12qnRXO7pWv8togtTsOvtVuGtwixnR-s2vLGPpdDfHw,74658
 rda_python_common/PgFile.py,sha256=gJuzBxLRYo3HQyNW1WNYDsQWRei2cco9bYEb6uOL8Ds,98487
-rda_python_common/PgLOG.py,sha256=AxEajxYDOzEEsvCEOCQ-WwKTQvL3ufJcOjCJ9el93lQ,55238
+rda_python_common/PgLOG.py,sha256=aY6EuPaIJlMEdfxR7_amraiwNnaKyU9CgW1LJ0jXWd4,55295
 rda_python_common/PgLock.py,sha256=12i84nsGBuifSyPnm8IR63LvHvRuVU573D5QKFlHdOI,22623
-rda_python_common/PgOPT.py,sha256=zX8lWFdfV6GxjLKfMc9eM76mjIjss_ulPieerejcmks,55936
+rda_python_common/PgOPT.py,sha256=Sf--l5iKY82xF5NbXxEy8PWip7ACpaa3KLdMac7E-oc,56047
 rda_python_common/PgSIG.py,sha256=ZVM9Qz6yIFurwIQJtV5-CFbKOTdFsZ-Rs95SEpDFgNk,35795
 rda_python_common/PgSplit.py,sha256=QKPbF55m8KCTGmwVwL3uG_nuylCC4FSVfLuXeLjJHbE,8816
 rda_python_common/PgUtil.py,sha256=OqESKCd72b9g8m8jwjPJhXDtPYlW6G8oSOhwChvz2Cg,48600
 rda_python_common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rda_python_common-1.0.37.dist-info/licenses/LICENSE,sha256=1dck4EAQwv8QweDWCXDx-4Or0S8YwiCstaso_H57Pno,1097
-rda_python_common-1.0.37.dist-info/METADATA,sha256=1_mZhDeUtUXg7GWnZQQlACo3jF1kHYWn2172h1CSbYo,716
-rda_python_common-1.0.37.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-rda_python_common-1.0.37.dist-info/top_level.txt,sha256=KVQmx7D3DD-jsiheqL8HdTrRE14hpRnZY5_ioMArA5k,18
-rda_python_common-1.0.37.dist-info/RECORD,,
+rda_python_common-1.0.39.dist-info/licenses/LICENSE,sha256=1dck4EAQwv8QweDWCXDx-4Or0S8YwiCstaso_H57Pno,1097
+rda_python_common-1.0.39.dist-info/METADATA,sha256=xVyK12SKzrcCt0yyxJ3O8BNTnPongZxU62638IqSHmw,716
+rda_python_common-1.0.39.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+rda_python_common-1.0.39.dist-info/top_level.txt,sha256=KVQmx7D3DD-jsiheqL8HdTrRE14hpRnZY5_ioMArA5k,18
+rda_python_common-1.0.39.dist-info/RECORD,,