diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2015-01-14 00:48:32 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2015-01-14 00:48:32 +0000 |
| commit | d73a8330016fbf172f8e3521b879502b9139a970 (patch) | |
| tree | 9368926e55d67bf565cc0f2275e203f464cf193a /src/supervision/s6-svwait.c | |
| parent | a6395bee8b2b696c0c74ff23a11944a491c83cc1 (diff) | |
| download | s6-d73a8330016fbf172f8e3521b879502b9139a970.tar.xz | |
- Parallel build fixv2.0.1.0
- Complete readiness notification via supervise/ready
- Version updated to 2.0.1.0, release candidate
Diffstat (limited to 'src/supervision/s6-svwait.c')
| -rw-r--r-- | src/supervision/s6-svwait.c | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/src/supervision/s6-svwait.c b/src/supervision/s6-svwait.c index 0d7c96c..a6dc410 100644 --- a/src/supervision/s6-svwait.c +++ b/src/supervision/s6-svwait.c @@ -1,5 +1,7 @@ /* ISC license. */ +#include <unistd.h> +#include <errno.h> #include <skalibs/sgetopt.h> #include <skalibs/bytestr.h> #include <skalibs/uint16.h> @@ -77,8 +79,23 @@ int main (int argc, char const *const *argv) for (i = 0 ; i < (unsigned int)argc ; i++) { s6_svstatus_t st = S6_SVSTATUS_ZERO ; + int isup ; if (!s6_svstatus_read(argv[i], &st)) strerr_diefu1sys(111, "s6_svstatus_read") ; - bitarray_poke(states, i, !!st.pid) ; + isup = !!st.pid ; + if (re[0] == 'U' && isup) + { + unsigned int len = str_len(argv[i]) ; + char s[len + 1 + sizeof(S6_SUPERVISE_READY_FILENAME)] ; + byte_copy(s, len, argv[i]) ; + s[len] = '/' ; + byte_copy(s + len + 1, sizeof(S6_SUPERVISE_READY_FILENAME), S6_SUPERVISE_READY_FILENAME) ; + if (access(s, F_OK) < 0) + { + if (errno == ENOENT) isup = 0 ; + else strerr_warnwu2sys("check ", s) ; + } + } + bitarray_poke(states, i, isup) ; } for (;;) |