about summary refs log tree commit diff
diff options
context:
space:
mode:
authorLeah Neukirchen <leah@vuxu.org>2024-01-06 23:11:52 +0100
committerLeah Neukirchen <leah@vuxu.org>2024-01-06 23:12:22 +0100
commit294b54e6771b576ae321146be0900dba05ff2477 (patch)
tree1eb41f3c56e4bf0e57b96bfa91b52e1ec7492306
parent94124785938b9905d862c479f8ed139623222c95 (diff)
downloadnitro-294b54e6771b576ae321146be0900dba05ff2477.tar.gz
nitro-294b54e6771b576ae321146be0900dba05ff2477.tar.xz
nitro-294b54e6771b576ae321146be0900dba05ff2477.zip
oneshots can have finish scripts that run into timeouts
-rw-r--r--nitro.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/nitro.c b/nitro.c
index e4cd12d..8d3b8d0 100644
--- a/nitro.c
+++ b/nitro.c
@@ -465,7 +465,8 @@ proc_kill(int i)
 		kill(services[i].finishpid, SIGKILL);
 
 	assert(services[i].state == PROC_SHUTDOWN ||
-	    services[i].state == PROC_RESTART);
+	    services[i].state == PROC_RESTART ||
+	    services[i].state == PROC_ONESHOT);
 }
 
 void
@@ -686,13 +687,13 @@ process_step(int i, enum process_events ev)
 
 		case PROC_RESTART:
 		case PROC_SHUTDOWN:
+		case PROC_ONESHOT:
 			proc_kill(i);
 			break;
 
 		case PROC_UP:
 		case PROC_DOWN:
 		case PROC_FATAL:
-		case PROC_ONESHOT:
 		case PROC_SETUP:
 			assert(!"invalid timeout handler");
 			break;