sysrepo-python-plugind 1.0.0__tar.gz → 1.0.1__tar.gz

{sysrepo_python_plugind-1.0.0/src/sysrepo_python_plugind.egg-info → sysrepo_python_plugind-1.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sysrepo-python-plugind
-Version: 1.0.0
+Version: 1.0.1
 Summary: Python plugin daemon for sysrepo (replacement for sysrepo-plugind)
 License-Expression: BSD-3-Clause
 Project-URL: Repository, https://github.com/entrypoint-communications/sysrepo-python-plugind

{sysrepo_python_plugind-1.0.0 → sysrepo_python_plugind-1.0.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "sysrepo-python-plugind"
-version = "1.0.0"
+version = "1.0.1"
 description = "Python plugin daemon for sysrepo (replacement for sysrepo-plugind)"
 readme = "README.rst"
 license = "BSD-3-Clause"

sysrepo_python_plugind-1.0.1/setup.cfg

@@ -0,0 +1,38 @@
+[metadata]
+name = sysrepo-python-plugind
+version = 1.0.1
+description = Python plugin daemon for sysrepo (replacement for sysrepo-plugind)
+long_description = file: README.rst
+long_description_content_type = text/x-rst
+license = BSD-3-Clause
+project_urls = 
+	Repository = https://github.com/entrypoint-communications/sysrepo-python-plugind
+
+[options]
+python_requires = >=3.10
+packages = find:
+package_dir = 
+	= src
+install_requires = 
+	sysrepo~=2.0
+
+[options.packages.find]
+where = src
+
+[options.entry_points]
+console_scripts = 
+	sysrepo-python-plugind = sysrepo_python_plugind:main
+	sysrepo-python-plugind-setup = sysrepo_python_plugind.install_yang:main
+
+[options.package_data]
+sysrepo_python_plugind = 
+	yang/*.yang
+
+[options.extras_require]
+test = 
+	pytest>=7
+
+[egg_info]
+tag_build = 
+tag_date = 0
+

{sysrepo_python_plugind-1.0.0 → sysrepo_python_plugind-1.0.1}/src/sysrepo_python_plugind/cli.py

@@ -73,7 +73,12 @@ def main() -> int:
     if args.pid_file:
         return _run_with_pid(daemon, args.pid_file, debug=args.debug)
 
-    if not args.debug:
+    # When running under systemd (Type=notify), NOTIFY_SOCKET is set and the
+    # process must stay in the foreground so READY=1 is sent from the tracked
+    # main PID.  Daemonizing here would cause systemd to reject the notification
+    # from the forked grandchild and fail the service with result 'protocol'.
+    under_systemd = bool(os.environ.get("NOTIFY_SOCKET"))
+    if not args.debug and not under_systemd:
         _daemonize()
     return daemon.run()
 
@@ -94,9 +99,10 @@ def _run_with_pid(daemon: PluginDaemon, pid_path: str, debug: bool) -> int:
         int: Exit code from daemon.run(), or 1 if the PID file is already
             locked by another instance.
     """
+    under_systemd = bool(os.environ.get("NOTIFY_SOCKET"))
     try:
         with PidFile(pid_path) as pid_file:
-            if not debug:
+            if not debug and not under_systemd:
                 _daemonize()
             return daemon.run(pid_file)
     except RuntimeError as exc:

{sysrepo_python_plugind-1.0.0 → sysrepo_python_plugind-1.0.1}/src/sysrepo_python_plugind/daemon.py

@@ -92,9 +92,11 @@ class PluginDaemon:
                     LOG.info(
                         "daemon ready, %d plugin(s) loaded", len(self._plugins)
                     )
-                    self._stop.wait()
+                    while not self._stop.wait(timeout=1.0):
+                        pass
                     LOG.info("shutting down")
                     _sd_notify("STOPPING=1")
+                    self._arm_exit_watchdog()
                     self._cleanup_plugins(sess)
         except Exception:
             LOG.exception("daemon error")
@@ -104,6 +106,25 @@ class PluginDaemon:
 
         return rc
 
+    # ------------------------------------------------------------------
+    # Shutdown watchdog
+
+    def _arm_exit_watchdog(self, timeout: float = 10.0) -> None:
+        """Force-exit if sysrepo cleanup stalls longer than *timeout* seconds.
+
+        Sysrepo's C library waits for its subscription threads to join when
+        a session or connection is closed.  Those threads can block indefinitely
+        if a callback is in-flight or stuck in a poll.  The watchdog fires
+        os._exit() so the process never has to wait for SIGKILL from systemd.
+        """
+        def _force() -> None:
+            LOG.warning("cleanup stalled after %.0f s, forcing exit", timeout)
+            os._exit(1)
+
+        t = threading.Timer(timeout, _force)
+        t.daemon = True
+        t.start()
+
     # ------------------------------------------------------------------
     # Signal handling
 
@@ -116,10 +137,11 @@ class PluginDaemon:
         ignored.
         """
         def _handler(sig: int, _frame) -> None:
+            sig_name = signal.Signals(sig).name
             if self._stop.is_set():
-                # Second signal while already shutting down → hard exit.
+                LOG.warning("received %s during shutdown, forcing exit", sig_name)
                 sys.exit(1)
-            LOG.info("received %s, initiating shutdown", signal.Signals(sig).name)
+            LOG.warning("received %s, initiating graceful shutdown", sig_name)
             self._stop.set()
 
         for sig in (

{sysrepo_python_plugind-1.0.0 → sysrepo_python_plugind-1.0.1/src/sysrepo_python_plugind.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sysrepo-python-plugind
-Version: 1.0.0
+Version: 1.0.1
 Summary: Python plugin daemon for sysrepo (replacement for sysrepo-plugind)
 License-Expression: BSD-3-Clause
 Project-URL: Repository, https://github.com/entrypoint-communications/sysrepo-python-plugind

{sysrepo_python_plugind-1.0.0 → sysrepo_python_plugind-1.0.1}/src/sysrepo_python_plugind.egg-info/SOURCES.txt

@@ -1,6 +1,7 @@
 LICENSE
 README.rst
 pyproject.toml
+setup.cfg
 src/sysrepo_python_plugind/__init__.py
 src/sysrepo_python_plugind/__main__.py
 src/sysrepo_python_plugind/cli.py

sysrepo_python_plugind-1.0.0/setup.cfg

@@ -1,4 +0,0 @@
-[egg_info]
-tag_build = 
-tag_date = 0
-