Fix rtt, including bug in time compute

hbd/server/main.py

@@ -79,14 +79,11 @@ async def _run_async(config):
     # Initialize threshold checker
     threshold_checker = threshold_mod.ThresholdChecker(
         config=config,
-        notification_callback=notify_mod.pushmsg_from_config,
         renotify_interval=config.get("threshold_renotify_interval", 3600),
         journal=msg_journal,
     )
     logger.info("Threshold checker initialized")
 
-    pushmsg = notify_mod.pushmsg_from_config
-
     sock = socket.socket(socket.AF_INET6, socket.SOCK_DGRAM)
     # Disable IPV6_V6ONLY option to enable dual-stack (listen on IPv4 as well)
     # This option is system-dependent; on many systems, setting it to False enables
@@ -110,7 +107,6 @@ async def _run_async(config):
             config=config,
             hbdclass=hbdclass,
             log=eventlog,
-            pushmsg=pushmsg,
             msg_to_websockets=msg_to_websockets,
             msg_journal=msg_journal,
             threshold_checker=threshold_checker,
@@ -132,12 +128,8 @@ async def _run_async(config):
                 port=config.get("hbd_port", 50004),
                 config=config,
                 hbdclass=hbdclass,
-                log=eventlog,
-                pushmsg=pushmsg,
-                msg_to_websockets=msg_to_websockets,
                 threshold_checker=threshold_checker,
                 tcss=None,
-                DEBUG=config.get("debug", 0),
                 verbose=config.get("verbose", False),
                 get_now=lambda: time.time(),
                 VER="",
@@ -155,7 +147,7 @@ async def _run_async(config):
     dns_task = None
     try:
         dns_task = dns_mod.start_dns_worker(
-            hbdclass, config, log=eventlog, pushmsg=pushmsg, loop=loop
+            hbdclass, config, log=eventlog, loop=loop
         )
         logger.info("dns update worker started")
     except Exception as e:
@@ -273,10 +265,11 @@ def load_pickled_hosts(config, hbdclass):
     """Load pickled hosts from file, if available."""
     import os
     import pickle
+    from . import config as config_mod
 
     pickfile = config.get("pickfile", "hbd.pickle")
-    dyndnshosts = config.get("dyndnshosts", [])
-    watchhosts = config.get("watchhosts", [])
+    dyndnshosts = config_mod.get_dyndnshosts(config)
+    watchhosts = config_mod.get_watchhosts(config)
     drophosts = config.get("drophosts", [])
     if 1 and os.path.exists(pickfile):
         if config.get("verbose", False):