summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--AUTHORS2
-rw-r--r--src/s6-rc/s6-rc.c5
2 files changed, 3 insertions, 4 deletions
diff --git a/AUTHORS b/AUTHORS
index a3d0444..02a3e22 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -4,6 +4,7 @@ Main author:
Contributors:
Eric Le Bihan <eric.le.bihan.dev@free.fr>
Brett Neumeier <bneumeier@gmail.com>
+ Lionel Van Bemten <lionel.van_bemten@nokia.com>
Thanks to:
Avery Payne <avery.p.payne@gmail.com>
@@ -11,7 +12,6 @@ Thanks to:
Guillermo <gdiazhartusch@gmail.com>
Colin Booth <cathexis@gmail.com>
Casper Ti. Vector <caspervector@gmail.com>
- Lionel Van Bemten <lionel.van_bemten@nokia.com>
Jesse Young <jlyo@jlyo.org>
Rasmus Villemoes <rasmus.villemoes@prevas.dk>
Jan Bramkamp <crest_maintainer@rlwinm.de>
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 ;