walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

nghttpx: Use _Exit when exiting from child process

This commit is contained in:
Tatsuhiro Tsujikawa 2015-09-24 23:57:24 +09:00
parent 938fa9a1e2
commit c44587a70c
4 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/shrpx.cc
View File

@ -244,6 +244,8 @@ void exec_binary(SignalServer *ssv) {
return; return;
} }
// child process
shrpx_signal_unset_master_proc_ign_handler(); shrpx_signal_unset_master_proc_ign_handler();
rv = shrpx_signal_unblock_all(); rv = shrpx_signal_unblock_all();
@ -251,7 +253,7 @@ void exec_binary(SignalServer *ssv) {
auto error = errno; auto error = errno;
LOG(ERROR) << "Unblocking all signals failed: " << strerror(error); LOG(ERROR) << "Unblocking all signals failed: " << strerror(error);
exit(EXIT_FAILURE); _Exit(EXIT_FAILURE);
} }
auto exec_path = util::get_exec_path(get_config()->argc, get_config()->argv, auto exec_path = util::get_exec_path(get_config()->argc, get_config()->argv,
@ -259,7 +261,7 @@ void exec_binary(SignalServer *ssv) {
if (!exec_path) { if (!exec_path) {
LOG(ERROR) << "Could not resolve the executable path"; LOG(ERROR) << "Could not resolve the executable path";
exit(EXIT_FAILURE); _Exit(EXIT_FAILURE);
} }
auto argv = make_unique<char *[]>(get_config()->argc + 1); auto argv = make_unique<char *[]>(get_config()->argc + 1);
@ -336,7 +338,7 @@ void exec_binary(SignalServer *ssv) {
if (execve(argv[0], argv.get(), envp.get()) == -1) { if (execve(argv[0], argv.get(), envp.get()) == -1) {
auto error = errno; auto error = errno;
LOG(ERROR) << "execve failed: errno=" << error; LOG(ERROR) << "execve failed: errno=" << error;
exit(EXIT_FAILURE); _Exit(EXIT_FAILURE);
} }
} }
} // namespace } // namespace
@ -699,7 +701,7 @@ pid_t fork_worker_process(SignalServer *ssv) {
auto error = errno; auto error = errno;
LOG(FATAL) << "Unblocking all signals failed: " << strerror(error); LOG(FATAL) << "Unblocking all signals failed: " << strerror(error);
exit(EXIT_FAILURE); _Exit(EXIT_FAILURE);
} }
close(ssv->ipc_fd[1]); close(ssv->ipc_fd[1]);
@ -708,10 +710,10 @@ pid_t fork_worker_process(SignalServer *ssv) {
if (rv != 0) { if (rv != 0) {
LOG(FATAL) << "Worker process returned error"; LOG(FATAL) << "Worker process returned error";
exit(EXIT_FAILURE); _Exit(EXIT_FAILURE);
} }
exit(EXIT_SUCCESS); _Exit(EXIT_SUCCESS);
} }
// parent process // parent process

2
src/shrpx.h
View File

@ -42,6 +42,6 @@
#define _Exit(status) _exit(status) #define _Exit(status) _exit(status)
#endif // !HAVE__EXIT #endif // !HAVE__EXIT
#define DIE() exit(EXIT_FAILURE) #define DIE() _Exit(EXIT_FAILURE)
#endif // SHRPX_H #endif // SHRPX_H

6
src/shrpx_connection_handler.cc
View File

@ -454,7 +454,7 @@ int ConnectionHandler::start_ocsp_update(const char *cert_file) {
auto error = errno; auto error = errno;
LOG(FATAL) << "Unblocking all signals failed: " << strerror(error); LOG(FATAL) << "Unblocking all signals failed: " << strerror(error);
exit(EXIT_FAILURE); _Exit(EXIT_FAILURE);
} }
dup2(pfd[1], 1); dup2(pfd[1], 1);
@ -465,7 +465,7 @@ int ConnectionHandler::start_ocsp_update(const char *cert_file) {
auto error = errno; auto error = errno;
LOG(ERROR) << "Could not execute ocsp query command: " << argv[0] LOG(ERROR) << "Could not execute ocsp query command: " << argv[0]
<< ", execve() faild, errno=" << error; << ", execve() faild, errno=" << error;
exit(EXIT_FAILURE); _Exit(EXIT_FAILURE);
} }
// unreachable // unreachable
} }
@ -482,7 +482,7 @@ int ConnectionHandler::start_ocsp_update(const char *cert_file) {
auto error = errno; auto error = errno;
LOG(FATAL) << "Restoring all signals failed: " << strerror(error); LOG(FATAL) << "Restoring all signals failed: " << strerror(error);
exit(EXIT_FAILURE); _Exit(EXIT_FAILURE);
} }
if (pid == -1) { if (pid == -1) {

6
src/shrpx_ssl.cc
View File

@ -88,6 +88,8 @@ int verify_callback(int preverify_ok, X509_STORE_CTX *ctx) {
} }
} // namespace } // namespace
// This function is meant be called from master process, hence the
// call exit(3).
std::vector<unsigned char> std::vector<unsigned char>
set_alpn_prefs(const std::vector<std::string> &protos) { set_alpn_prefs(const std::vector<std::string> &protos) {
size_t len = 0; size_t len = 0;
@ -95,7 +97,7 @@ set_alpn_prefs(const std::vector<std::string> &protos) {
for (const auto &proto : protos) { for (const auto &proto : protos) {
if (proto.size() > 255) { if (proto.size() > 255) {
LOG(FATAL) << "Too long ALPN identifier: " << proto.size(); LOG(FATAL) << "Too long ALPN identifier: " << proto.size();
DIE(); exit(EXIT_FAILURE);
} }
len += 1 + proto.size(); len += 1 + proto.size();
@ -103,7 +105,7 @@ set_alpn_prefs(const std::vector<std::string> &protos) {
if (len > (1 << 16) - 1) { if (len > (1 << 16) - 1) {
LOG(FATAL) << "Too long ALPN identifier list: " << len; LOG(FATAL) << "Too long ALPN identifier list: " << len;
DIE(); exit(EXIT_FAILURE);
} }
auto out = std::vector<unsigned char>(len); auto out = std::vector<unsigned char>(len);