daemon.notify accepts multiple args

src/trick17/daemon.py

@@ -65,18 +65,33 @@ def listen_fds() -> Iterator[tuple[int, str]]:
  return zip(fds, names, strict=True)
 
 
-def notify(state: str) -> bool:
- """notify 'state' to systemd; returns
+def notify(*msg: str) -> bool:
+ """notify '*msg' messages to systemd;
+ returns
  - True if notification sent to socket,
  - False if environment variable with notification socket is not set."""
 
  sock_path: str = os.getenv(trick17.SD_NOTIFY_SOCKET_ENV, "")
  if not sock_path:
  return False
 
- if not sock_path.startswith("/"):
- msg = f"notify to socket type '{sock_path}' not supported"
- raise NotImplementedError(msg)
- with util.make_socket() as sock:
- util.send_dgram_or_fd(sock, state.encode(), sock_path)
+ state = "\n".join(m.strip() for m in msg)
+
+ match sock_path.split(":"):
+ case [dest] if dest.startswith("/"):
+ # AF_UNIX
+ with util.make_socket() as sock:
+ util.send_dgram_or_fd(sock, state.encode(), sock_path)
+ case [dest] if dest.startswith("@"):
+ # Linux abstract namespace socket
+ errmsg = f"Abstract namespace sockets not implemented ('{sock_path}')"
+ raise NotImplementedError(errmsg)
+ case ["vsock", cid, port]: # noqa: F841
+ # AF_VSOCK
+ errmsg = f"AF_VSOCK sockets not implemented ('{sock_path}')"
+ raise NotImplementedError(errmsg)
+ case _:
+ errmsg = f"Unrecognized type of socket: {sock_path}"
+ raise ValueError(errmsg)
+
  return True

tests/test_daemon.py

@@ -8,7 +8,7 @@ def test_booted():
 
 
 def test_notify():
- ret = daemon.notify("READY=1")
+ ret = daemon.notify("READY=1", "STATUS=running")
  assert ret is False
 
 

tests/tnotify.py

@@ -0,0 +1,16 @@
+#!/usr/bin/env python
+import sys
+
+from trick17 import daemon
+
+
+def main():
+ ok = daemon.notify("READY=1", "STATUS=notified")
+ if ok:
+ sys.exit(0)
+ else:
+ sys.exit("Unable to send notification")
+
+
+if __name__ == "__main__":
+ main()

tests/tnotify.sh

@@ -0,0 +1,2 @@
+#!/bin/sh
+systemd-run --user --wait --service-type=notify -d -E PYTHONPATH=src tests/tnotify.py