Merge pull request #332 from robbevp/fix/stop-service-exit

Cleanly stop a service group if a service exits
numtide · Dec 31, 2024 · 4d062a4 · 4d062a4
2 parents dd6b809 + 81e38d4
commit 4d062a4
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/modules/services.nix b/modules/services.nix
@@ -73,11 +73,13 @@ let
             pid=$!
             echo $pid > "$PRJ_DATA_DIR/pids/${gName}.pid"
             on_stop() {
-                kill -TERM $pid
+                if ps -p $pid > /dev/null; then
+                  kill -TERM $pid
+                fi
                 rm "$PRJ_DATA_DIR/pids/${gName}.pid"
                 wait $pid
             }
-            trap "on_stop" SIGINT SIGTERM SIGHUP
+            trap "on_stop" SIGINT SIGTERM SIGHUP EXIT
             wait $pid
           '').outPath;
       }