rda-python-common 1.0.38__tar.gz → 1.0.39__tar.gz

{rda_python_common-1.0.38 → rda_python_common-1.0.39}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_common
-Version: 1.0.38
+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.38 → rda_python_common-1.0.39}/pyproject.toml

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

{rda_python_common-1.0.38 → rda_python_common-1.0.39}/src/rda_python_common/PgLOG.py

@@ -246,7 +246,7 @@ 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],
@@ -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,7 +290,7 @@ 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)
 
@@ -296,7 +298,7 @@ def send_email(subject = None, receiver = None, msg = None, sender = None, logac
 #  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']:
@@ -340,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
 
 #
@@ -415,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-1.0.38 → rda_python_common-1.0.39}/src/rda_python_common.egg-info/PKG-INFO

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