refactor monitor, add threshold rtesting

hbd/server/notify.py

@@ -8,7 +8,9 @@ import subprocess
 import smtplib
 import time
 import sys
+from . import data
 from . import ws as ws_mod
+from . import main as main_mod
 
 DEFAULT_PUSHPROVIDERS = ["all", "pushover", "mattermost", "signal"]
 msg_to_websockets = ws_mod.broadcast
@@ -17,19 +19,18 @@ msg_to_websockets = ws_mod.broadcast
 _config = {}
 logger = logging.getLogger(__name__)
 
-msgs = []
 logf = None
 
 def initlog(logfile):
     global logf
     try:
         logf = open(logfile, "a+")
-        return logf
     except Exception as e:
         import sys
 
         print("cannot open logfile %s, using STDERR: %s" % (logfile, e))
-        return sys.stderr
+        logf = sys.stderr
+    return logf
 
 def closelog():
     global logf
@@ -39,10 +40,13 @@ def closelog():
         except Exception:
             pass
 
-def log(host, m, service=None):
+def eventlog(host, lvl, m, service=None):
     ts = time.time()
-    s = f"{time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(ts))} {host or ''} {m}"
-    msgs.append(s)
+    s = f"{time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(ts))} {lvl} "
+    if host:
+        s += f"{host} "
+    s += m
+    data.msgs.append(s)
     logger.info(s)
     if logf:
         try: