diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2018-10-22 20:43:56 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2018-10-22 20:43:56 +0000 |
| commit | 54cd83a2e25008879f54860cb43f9031bc85d7c6 (patch) | |
| tree | 27b200472c3057538e638dfdcfe8416a66bf56f9 /src | |
| parent | 63643a4b7733008919cfb9f25902889b92136565 (diff) | |
| download | s6-54cd83a2e25008879f54860cb43f9031bc85d7c6.tar.xz | |
bugfix: s6-svscan not always honoring scan deadline
Diffstat (limited to 'src')
| -rw-r--r-- | src/supervision/s6-svscan.c | 2 |
1 files changed, 1 insertions, 1 deletions
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() ; |