Split the channel mode and extban replies.

[user/henk/code/inspircd.git] / src / inspircd.cpp

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index b6c25210427d450168a98a6b95714bc9842e41b9..f35482f618a975d48373385b31f4cf5edd8fde73 100644 (file)
--- 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>
@@ -94,8 +93,11 @@ void InspIRCd::Cleanup()
        }
        ports.clear();
 
-       // Disconnect all local users
+       // Tell modules that we're shutting down.
        const std::string quitmsg = "Server shutting down";
+       FOREACH_MOD(OnShutdown, (quitmsg));
+
+       // Disconnect all local users
        const UserManager::LocalList& list = Users.GetLocalUsers();
        while (!list.empty())
                ServerInstance->Users.QuitUser(list.front(), quitmsg);
@@ -121,10 +123,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 +193,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())
        {