From: Jason Boyer <JBoyer@EquinoxInitiative.org>
Date: Wed, 2 Jun 2021 13:43:12 +0000 (-0400)
Subject: LP1930578: Really Stop Single Services
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=caa10d7d3f4611e78918091dba6e40b2f37f6ba8;p=working%2FOpenSRF.git

LP1930578: Really Stop Single Services

Use the same timeout / escalation method for single services as is
used for all services. Punted on any real refactoring for now.

Signed-off-by: Jason Boyer <JBoyer@equinoxOLI.org>
Signed-off-by: Galen Charlton <gmc@equinoxOLI.org>
---

diff --git a/bin/opensrf-perl.pl.in b/bin/opensrf-perl.pl.in
index 40015e3..3c3e8d7 100755
--- a/bin/opensrf-perl.pl.in
+++ b/bin/opensrf-perl.pl.in
@@ -449,7 +449,12 @@ sub do_start_services {
 sub do_signal {
     my $service = shift;
     my $signal = shift;
-    return do_signal_all($signal, $service);
+    do_signal_send($service, $signal);
+
+    # if user passed a know non-shutdown signal, we're done.
+    return 1 if $signal =~ /HUP|USR1|USR2/;
+
+    return do_signal_wait($service);
 }
 
 # returns the list of running services based on presence of PID files.