support SSL ws session

hbd/notify.py

@@ -21,21 +21,21 @@ def setup(cfg: dict):
     _config = dict(cfg)
 
 
-def send_email(aemail, smtpserver, sender, subject, body, debug=0):
+def send_email(toaddrs, smtpserver, sender, subject, body, debug=0):
     """Send a plain email via SMTP. Returns True on success."""
     try:
         smtpport = _config.get("smtpport", 587) 
-        server = smtplib.SMTP(smtpserver, smtpport))
+        server = smtplib.SMTP(smtpserver, smtpport)
         if debug > 0:
             server.set_debuglevel(1)
         if smtpport == 587:
             server.starttls()
             server.ehlo()
             smtpuser = _config.get("smtpuser", None)
-            smtppassword = _config.get("smtp_password", None)
+            smtppassword = _config.get("smtppassword", None)
             if smtpuser and smtppassword:
                 server.login(smtpuser, smtppassword)
-        server.sendmail(sender, aemail, body)
+        server.sendmail(sender, toaddrs, body)
     except Exception as e:
         logger.warning("email send failed: %s", e)
         try:
@@ -56,9 +56,12 @@ def email(subject: str, msg: str, debug: int = 0) -> bool:
     Uses module-level configuration to supply recipient list, smtp server
     and sender address.
     """
-    toaddrs = _config.get("AEMAIL") or _config.get("aemail") or _config.get("email_to") or []
-    fromemail = _config.get("fromemail") or _config.get("sender") or f"aew.heartbeat@{_config.get('domain','local') }"
-    smtpserver = _config.get("smtpserver") or _config.get("SMTPSERVER", "localhost")
+    toaddrs = _config.get("toemail")
+    fromemail = _config.get("fromemail") 
+    smtpserver = _config.get("smtpserver") 
+    if not toaddrs or not fromemail or not smtpserver:
+        logger.warning("email config incomplete: toemail=%s, fromemail=%s, smtpserver=%s", toaddrs, fromemail, smtpserver)
+        return False
     date = time.strftime("%a, %d %b %Y %H:%M:%S %z", time.localtime())
     body = "To: %s\nFrom: %s\nSubject: %s\nDate: %s\n\n%s" % (
         toaddrs[0] if toaddrs else "",
@@ -153,6 +156,9 @@ def pushmsg(cfg: dict, msg: str, debug: int = 0):
     if p in ("all", "signal"):
         ok = pushsignal(cfg.get("signal_cli", "/usr/local/bin/signal-cli"), cfg.get("signal_user", ""), cfg.get("signal_recipient", ""), msg, debug=debug)
         results["signal"] = ok
+    if p in ("all", "email"):
+        ok = email("Heartbeat notification", msg, debug=debug)
+        results["email"] = ok
     logger.debug("push results: %s", results)
     return results