From: Cyrill Gorcunov <gorcunov@gmail.com> To: tml <tarantool-patches@dev.tarantool.org> Subject: [Tarantool-patches] [PATCH 5/7] popen: add logging in child process Date: Mon, 2 Mar 2020 23:12:25 +0300 [thread overview] Message-ID: <20200302201227.31785-6-gorcunov@gmail.com> (raw) In-Reply-To: <20200302201227.31785-1-gorcunov@gmail.com> This helps to identify if something gone wrong inside a child process. Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> --- src/lib/core/popen.c | 57 ++++++++++++++++++++++++++++++++++---------- 1 file changed, 45 insertions(+), 12 deletions(-) diff --git a/src/lib/core/popen.c b/src/lib/core/popen.c index 806d004bf..6e5ca21bd 100644 --- a/src/lib/core/popen.c +++ b/src/lib/core/popen.c @@ -623,13 +623,17 @@ signal_reset(void) sigaction(SIGHUP, &sa, NULL) == -1 || sigaction(SIGWINCH, &sa, NULL) == -1 || sigaction(SIGSEGV, &sa, NULL) == -1 || - sigaction(SIGFPE, &sa, NULL) == -1) + sigaction(SIGFPE, &sa, NULL) == -1) { + say_error("child: sigaction failed"); _exit(errno); + } /* Unblock any signals blocked by libev */ sigfillset(&sigset); - if (sigprocmask(SIG_UNBLOCK, &sigset, NULL) == -1) + if (sigprocmask(SIG_UNBLOCK, &sigset, NULL) == -1) { + say_error("child: SIG_UNBLOCK failed"); _exit(errno); + } } /** @@ -725,9 +729,10 @@ popen_new(struct popen_opts *opts) }; /* * At max we could be skipping each pipe end - * plus dev/null variants. + * plus dev/null variants and logfd */ - int skip_fds[POPEN_FLAG_FD_STDEND_BIT * 2 + 2]; + int skip_fds[POPEN_FLAG_FD_STDEND_BIT * 2 + 2 + 1]; + int log_fd = log_get_fd(); size_t nr_skip_fds = 0; /* @@ -755,6 +760,8 @@ popen_new(struct popen_opts *opts) if (!handle) return NULL; + if (log_fd >= 0) + skip_fds[nr_skip_fds++] = log_fd; skip_fds[nr_skip_fds++] = dev_null_fd_ro; skip_fds[nr_skip_fds++] = dev_null_fd_wr; assert(nr_skip_fds <= lengthof(skip_fds)); @@ -831,13 +838,17 @@ popen_new(struct popen_opts *opts) * won't be able to kill a group of children. */ if (opts->flags & POPEN_FLAG_SETSID) { - if (setsid() == -1) + if (setsid() == -1) { + say_syserror("child: setsid failed"); goto exit_child; + } } if (opts->flags & POPEN_FLAG_CLOSE_FDS) { - if (close_inherited_fds(skip_fds, nr_skip_fds)) + if (close_inherited_fds(skip_fds, nr_skip_fds)) { + say_syserror("child: close inherited fds"); goto exit_child; + } } for (i = 0; i < lengthof(pfd_map); i++) { @@ -849,13 +860,19 @@ popen_new(struct popen_opts *opts) int child_idx = pfd_map[i].child_idx; /* put child peer end at known place */ - if (dup2(pfd[i][child_idx], fileno) < 0) + if (dup2(pfd[i][child_idx], fileno) < 0) { + say_syserror("child: dup %d -> %d", + pfd[i][child_idx], fileno); goto exit_child; + } /* parent's pipe no longer needed */ if (close(pfd[i][0]) || - close(pfd[i][1])) + close(pfd[i][1])) { + say_syserror("child: close %d %d", + pfd[i][0], pfd[i][1]); goto exit_child; + } continue; } @@ -863,8 +880,10 @@ popen_new(struct popen_opts *opts) * Use /dev/null if requested. */ if (opts->flags & pfd_map[i].mask_devnull) { - if (dup2(*pfd_map[i].dev_null_fd, - fileno) < 0) { + if (dup2(*pfd_map[i].dev_null_fd, fileno) < 0) { + say_syserror("child: dup2 %d -> %d", + *pfd_map[i].dev_null_fd, + fileno); goto exit_child; } continue; @@ -877,8 +896,11 @@ popen_new(struct popen_opts *opts) * EBADF happens. */ if (opts->flags & pfd_map[i].mask_close) { - if (close(fileno) && errno != EBADF) + if (close(fileno) && errno != EBADF) { + say_syserror("child: can't close %d", + fileno); goto exit_child; + } continue; } @@ -888,8 +910,19 @@ popen_new(struct popen_opts *opts) */ } - if (close(dev_null_fd_ro) || close(dev_null_fd_wr)) + if (close(dev_null_fd_ro) || close(dev_null_fd_wr)) { + say_error("child: can't close %d or %d", + dev_null_fd_ro, dev_null_fd_wr); goto exit_child; + } + + if (log_fd >= 0) { + if (close(log_fd)) { + say_error("child: can't close logfd %d", + log_fd); + goto exit_child; + } + } if (opts->flags & POPEN_FLAG_SHELL) execve(_PATH_BSHELL, opts->argv, envp); -- 2.20.1
next prev parent reply other threads:[~2020-03-02 20:13 UTC|newest] Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-03-02 20:12 [Tarantool-patches] [PATCH 0/7] popen: various fixes and a test Cyrill Gorcunov 2020-03-02 20:12 ` [Tarantool-patches] [PATCH 1/7] core/say: Export logger fd Cyrill Gorcunov 2020-03-02 20:12 ` [Tarantool-patches] [PATCH 2/7] popen: allow accessing environ variable Cyrill Gorcunov 2020-03-02 20:12 ` [Tarantool-patches] [PATCH 3/7] popen: close_inherited_fds - add support for macos/freebsd Cyrill Gorcunov 2020-03-02 20:12 ` [Tarantool-patches] [PATCH 4/7] popen: log errors if popen creation failed Cyrill Gorcunov 2020-03-02 20:12 ` Cyrill Gorcunov [this message] 2020-03-02 20:12 ` [Tarantool-patches] [PATCH 6/7] popen: handle setsid os specifics Cyrill Gorcunov 2020-03-03 11:38 ` Alexander Turenko 2020-03-03 11:45 ` Cyrill Gorcunov 2020-03-10 15:49 ` Alexander Turenko 2020-03-10 16:36 ` Alexander Turenko 2020-03-10 16:41 ` Cyrill Gorcunov 2020-03-10 17:12 ` Alexander Turenko 2020-03-10 17:40 ` Cyrill Gorcunov 2020-03-11 7:55 ` [Tarantool-patches] [PATCH v5 6/7] popen: handle sid on macos Cyrill Gorcunov 2020-03-06 14:30 ` [Tarantool-patches] [PATCH v2 6/7] popen: handle setsid os specifics Cyrill Gorcunov 2020-03-10 8:02 ` [Tarantool-patches] [PATCH v3 6/7] popen: use ioctl on macos Cyrill Gorcunov 2020-03-02 20:12 ` [Tarantool-patches] [PATCH 7/7] test/unit: add popen test Cyrill Gorcunov 2020-03-11 20:22 ` Alexander Turenko 2020-03-12 10:38 ` [Tarantool-patches] [PATCH v5 " Cyrill Gorcunov 2020-03-12 11:58 ` [Tarantool-patches] [PATCH 0/7] popen: various fixes and a test Alexander Turenko 2020-03-12 12:18 ` Cyrill Gorcunov 2020-03-16 15:58 ` Kirill Yukhin
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200302201227.31785-6-gorcunov@gmail.com \ --to=gorcunov@gmail.com \ --cc=tarantool-patches@dev.tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH 5/7] popen: add logging in child process' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox