From 523e859ee45f12b4aeccee049529d6508bcea64f Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Sun, 22 Oct 2023 11:08:48 +0000
Subject: [PATCH] ntfy-waiter: more verbosity/debugging

---
 hosts/by-name/servo/services/ntfy/ntfy-waiter | 20 +++++++++++++++----
 .../servo/services/ntfy/ntfy-waiter.nix       | 15 +++++++++++++-
 2 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/hosts/by-name/servo/services/ntfy/ntfy-waiter b/hosts/by-name/servo/services/ntfy/ntfy-waiter
index 85b8a30c..02e1e22c 100755
--- a/hosts/by-name/servo/services/ntfy/ntfy-waiter
+++ b/hosts/by-name/servo/services/ntfy/ntfy-waiter
@@ -3,6 +3,7 @@
 
 import argparse
 import logging
+import os
 import socket
 import subprocess
 import sys
@@ -50,6 +51,10 @@ class Adapter:
         self.topic = topic
         self.clients = set()
 
+    def log_clients(self):
+        clients_str = '\n'.join(f'  {c.addr_info}' for c in self.clients)
+        logger.debug(f"clients alive ({len(self.clients)}):\n{clients_str}")
+
     def listener_loop(self):
         logger.info(f"listening for connections on {self.host}:{self.port}")
         s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
@@ -70,6 +75,8 @@ class Adapter:
         for c in dead_clients:
             self.clients.remove(c)
 
+        self.log_clients()
+
     def notify_loop(self):
         logger.info("waiting for notification events")
         ntfy_proc = subprocess.Popen(
@@ -88,9 +95,14 @@ def get_topic() -> str:
     return open('/run/secrets/ntfy-sh-topic', 'rt').read().strip()
 
 def run_forever(callable):
-    callable()
-    logger.error(f"{callable} unexpectedly returned")
-    sys.exit(1)
+    try:
+        callable()
+    except Exception as e:
+        logger.error(f"{callable} failed: {e}")
+    else:
+        logger.error(f"{callable} unexpectedly returned")
+    # sys.exit(1)
+    os._exit(1)  # sometimes `sys.exit()` doesn't actually exit...
 
 def main():
     logging.basicConfig()
@@ -114,7 +126,7 @@ def main():
     listener_loop = threading.Thread(target=run_forever, name="listener_loop", args=(adapter.listener_loop,))
     notify_loop = threading.Thread(target=run_forever, name="notify_loop", args=(adapter.notify_loop,))
 
-    # TODO: this method of exiting seems to leave the listener behind,
+    # TODO: this method of exiting seems to sometimes leave the listener behind (?)
     # preventing anyone else from re-binding the port.
     listener_loop.start()
     notify_loop.start()
diff --git a/hosts/by-name/servo/services/ntfy/ntfy-waiter.nix b/hosts/by-name/servo/services/ntfy/ntfy-waiter.nix
index 3783bbe8..5ee2d1ec 100644
--- a/hosts/by-name/servo/services/ntfy/ntfy-waiter.nix
+++ b/hosts/by-name/servo/services/ntfy/ntfy-waiter.nix
@@ -12,6 +12,14 @@ let
   numPorts = portHigh - portLow + 1;
   mkService = port: let
     silence = port - portLow;
+    flags = lib.optional cfg.verbose "--verbose";
+    cli = [
+      "${cfg.package}/bin/ntfy-waiter"
+      "--port"
+      "${builtins.toString port}"
+      "--silence"
+      "${builtins.toString silence}"
+    ] ++ flags;
   in {
     "ntfy-waiter-${builtins.toString silence}" = {
       # TODO: run not as root (e.g. as ntfy-sh)
@@ -19,7 +27,8 @@ let
       serviceConfig = {
         Type = "simple";
         Restart = "always";
-        ExecStart = "${cfg.package}/bin/ntfy-waiter --port ${builtins.toString port} --silence ${builtins.toString silence}";
+        RestartSec = "5s";
+        ExecStart = lib.concatStringsSep " " cli;
       };
       after = [ "network.target" ];
       wantedBy = [ "default.target" ];
@@ -32,6 +41,10 @@ in
       type = types.bool;
       default = true;
     };
+    sane.ntfy-waiter.verbose = mkOption {
+      type = types.bool;
+      default = true;
+    };
     sane.ntfy-waiter.package = mkOption {
       type = types.package;
       default = pkgs.static-nix-shell.mkPython3Bin {