summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2019-08-20 19:24:28 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2019-08-20 19:24:28 +0000
commit4a4ae93e7aacdffa23d7e7094ade5e4db6ffc282 (patch)
tree551138d91b16f9d91000906d63f57331a776907a /src
parent3c76777ef10922f103616118089ed65112451879 (diff)
downloads6-rc-4a4ae93e7aacdffa23d7e7094ade5e4db6ffc282.tar.xz
Cosmetic changes, credit Lionel
Diffstat (limited to 'src')
-rw-r--r--src/s6-rc/s6-rc.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/s6-rc/s6-rc.c b/src/s6-rc/s6-rc.c
index 45ec880..49a7fe7 100644
--- a/src/s6-rc/s6-rc.c
+++ b/src/s6-rc/s6-rc.c
@@ -298,8 +298,7 @@ static void on_success (unsigned int i, int h)
announce() ;
if (verbosity >= 2)
strerr_warni5x(dryrun[0] ? "simulation: " : "", "service ", db->string + db->services[i].name, h ? " started" : " stopped", " successfully") ;
- if (!lameduck)
- broadcast_success(i, h) ;
+ if (!lameduck) broadcast_success(i, h) ;
}
static void on_failure (unsigned int i, int h, int crashed, unsigned int code)
@@ -371,7 +370,7 @@ static int handle_signals (int h)
case SIGTERM :
case SIGINT :
if (verbosity >= 2)
- strerr_warnw3x("received ", sig_name(sig), ", aborting longrun transitions") ;
+ strerr_warnw3x("received ", sig_name(sig), ", aborting longrun transitions and exiting asap") ;
/* kill_oneshots() ; */
kill_longruns() ;
lameduck = 1 ;