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

rda_python_common/PgLOG.py

@@ -402,15 +402,11 @@ def pglog(msg, logact = MSGLOG):
       if logact&EMLLOG: logact &= ~EMLLOG
       if not logact&ERRLOG: logact &= ~EMEROL
 
-   if msg: msg = msg.lstrip()  # remove leading whitespaces for logging message
-
+   msg = msg.lstrip() if msg else ''  # remove leading whitespaces for logging message
    if logact&EXITLG:
       ext = "Exit 1 in {}\n".format(os.getcwd())
-      if not msg:
-         msg = ext
-      else:
-         msg = msg.rstrip()
-         msg += "; " + ext
+      if msg: msg = msg.rstrip() + "; "
+      msg += ext
    else:
       if msg and not re.search(r'(\n|\r)$', msg): msg += "\n"
       if logact&RETMSG: retmsg = msg
@@ -418,7 +414,8 @@ 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 = send_email(title.rstrip())
+         msg = title + '\n' + msg
+         send_email(title.rstrip())
       elif msg:
          set_email(msg, logact)
 
@@ -428,7 +425,8 @@ def pglog(msg, logact = MSGLOG):
       if not logact&EMLALL: set_email(msg, logact)
       title = "ABORTS {}-{}".format(PGLOG['HOSTNAME'], get_command())
       set_email((("ABORTS " + CPID['PID']) if CPID['PID'] else title), EMLTOP)
-      msg += send_email(title)
+      msg = title + '\n' + msg
+      send_email(title)
 
    if logact&LOGERR: # make sure error is always logged
       msg = break_long_string(msg)

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_common
-Version: 1.0.36
+Version: 1.0.37
 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.36.dist-info → rda_python_common-1.0.37.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=FhminRf-ER__lOTpcqm1ynQLYFP5RIDUNGO1Mrmwh9Y,55227
+rda_python_common/PgLOG.py,sha256=AxEajxYDOzEEsvCEOCQ-WwKTQvL3ufJcOjCJ9el93lQ,55238
 rda_python_common/PgLock.py,sha256=12i84nsGBuifSyPnm8IR63LvHvRuVU573D5QKFlHdOI,22623
 rda_python_common/PgOPT.py,sha256=zX8lWFdfV6GxjLKfMc9eM76mjIjss_ulPieerejcmks,55936
 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.36.dist-info/licenses/LICENSE,sha256=1dck4EAQwv8QweDWCXDx-4Or0S8YwiCstaso_H57Pno,1097
-rda_python_common-1.0.36.dist-info/METADATA,sha256=kF8m3xXZgi0fDbMQ8nrhyh-WHlJU8E5MaRtg8JYnfBw,716
-rda_python_common-1.0.36.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-rda_python_common-1.0.36.dist-info/top_level.txt,sha256=KVQmx7D3DD-jsiheqL8HdTrRE14hpRnZY5_ioMArA5k,18
-rda_python_common-1.0.36.dist-info/RECORD,,
+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,,