From 54cd83a2e25008879f54860cb43f9031bc85d7c6 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Mon, 22 Oct 2018 20:43:56 +0000
Subject:  bugfix: s6-svscan not always honoring scan deadline

---
 src/supervision/s6-svscan.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/supervision')

diff --git a/src/supervision/s6-svscan.c b/src/supervision/s6-svscan.c
index 0d06bac..4228a21 100644
--- 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() ;
-- 
cgit v1.2.3