s6

commit 54cd83a2e25008879f54860cb43f9031bc85d7c6
parent 63643a4b7733008919cfb9f25902889b92136565
Author: Laurent Bercot <ska-skaware@skarnet.org>
Date:   Mon, 22 Oct 2018 20:43:56 +0000

 bugfix: s6-svscan not always honoring scan deadline

Diffstat:
M
AUTHORS
 | 
1
+
M
src/supervision/s6-svscan.c
 | 
2
+-

2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/AUTHORS b/AUTHORS
@@ -32,3 +32,4 @@ Thanks to:
   Hardware <contact@meshup.net>
   Earl Chew <earl_chew@yahoo.com>
   Jonathan de Boyne Pollard <J.deBoynePollard@NTLWorld.com>
+  Luis Ressel <aranea@aixah.de>
diff --git a/src/supervision/s6-svscan.c b/src/supervision/s6-svscan.c
@@ -408,6 +408,7 @@ static void scan (void)
   DIR *dir ;
   if (!wantscan) return ;
   wantscan = 0 ;
+  tain_add_g(&deadline, &defaulttimeout) ;
   dir = opendir(".") ;
   if (!dir)
   {
@@ -529,7 +530,6 @@ int main (int argc, char const *const *argv)
     while (cont)
     {
       int r ;
-      tain_add_g(&deadline, &defaulttimeout) ;
       reap() ;
       scan() ;
       killthem() ;