diff options
| author |  Sadie Powell | 2019-07-16 15:11:21 +0100 |
|---|---|---|
| committer | Sadie Powell | 2019-07-16 16:48:18 +0100 |
| commit | cd8b456f979733525941284639d8bf899173b429 (patch) | |
| tree | f1d26962e61c74c5acb076662a909beafbe8e5fd /src/inspircd.cpp | |
| parent | Replace socketengine_{pthread,win32} with C++11 threads. (diff) | |
| parent | ssl_gnutls: remove PackageInfo directives for EOL Debian versions. (diff) | |
Merge branch 'insp3' into master.
Diffstat (limited to 'src/inspircd.cpp')
| -rw-r--r-- | src/inspircd.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/inspircd.cpp b/src/inspircd.cpp index 3468ca7f3..d05aa9aa6 100644 --- a/src/inspircd.cpp +++ b/src/inspircd.cpp @@ -30,7 +30,6 @@ #include <signal.h> #ifndef _WIN32 - #include <dirent.h> #include <unistd.h> #include <sys/resource.h> #include <dlfcn.h> @@ -121,10 +120,11 @@ void InspIRCd::SetSignals() { #ifndef _WIN32 signal(SIGALRM, SIG_IGN); + signal(SIGCHLD, SIG_IGN); signal(SIGHUP, InspIRCd::SetSignal); signal(SIGPIPE, SIG_IGN); - signal(SIGCHLD, SIG_IGN); - /* We want E2BIG not a signal! */ + signal(SIGUSR1, SIG_IGN); + signal(SIGUSR2, SIG_IGN); signal(SIGXFSZ, SIG_IGN); #endif signal(SIGTERM, InspIRCd::SetSignal); @@ -190,9 +190,7 @@ void InspIRCd::WritePID(const std::string& filename, bool exitonfail) return; } - std::string fname(filename); - if (fname.empty()) - fname = ServerInstance->Config->Paths.PrependData("inspircd.pid"); + std::string fname = ServerInstance->Config->Paths.PrependData(filename.empty() ? "inspircd.pid" : filename); std::ofstream outfile(fname.c_str()); if (outfile.is_open()) { |