From 9ffddf3d9f0709b46d3aa278026442ce433969f9 Mon Sep 17 00:00:00 2001
From: zaihuaji <zaihuaji@gmail.com>
Date: Thu, 4 Sep 2025 19:16:45 -0500
Subject: [PATCH] send_email

---
 pyproject.toml                 |  2 +-
 src/rda_python_common/PgLOG.py | 16 +++++++---------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 67d228a..00c6c2f 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "rda_python_common"
-version = "1.0.36"
+version = "1.0.37"
 authors = [
   { name="Zaihua Ji", email="zji@ucar.edu" },
 ]
diff --git a/src/rda_python_common/PgLOG.py b/src/rda_python_common/PgLOG.py
index 0f81300..9948a3c 100644
--- a/src/rda_python_common/PgLOG.py
+++ b/src/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)