Merge pull request #1162 from SaberUK/insp20+fix-deinstall

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

diff --git a/src/socketengines/socketengine_epoll.cpp b/src/socketengines/socketengine_epoll.cpp
index f7e107e7b028cd4db4301b21b56f533117d8d432..f2837777ad7ec7a3ac11e6116be84bc70ca9ca0e 100644 (file)
--- a/src/socketengines/socketengine_epoll.cpp
+++ b/src/socketengines/socketengine_epoll.cpp
@@ -54,6 +54,7 @@ public:
 
 EPollEngine::EPollEngine()
 {
+       CurrentSetSize = 0;
        int max = ulimit(4, 0);
        if (max > 0)
        {
@@ -63,7 +64,7 @@ EPollEngine::EPollEngine()
        {
                ServerInstance->Logs->Log("SOCKET", DEFAULT, "ERROR: Can't determine maximum number of open sockets!");
                std::cout << "ERROR: Can't determine maximum number of open sockets!" << std::endl;
-               ServerInstance->Exit(EXIT_STATUS_SOCKETENGINE);
+               ServerInstance->QuickExit(EXIT_STATUS_SOCKETENGINE);
        }
 
        // This is not a maximum, just a hint at the eventual number of sockets that may be polled.
@@ -75,7 +76,7 @@ EPollEngine::EPollEngine()
                ServerInstance->Logs->Log("SOCKET",DEFAULT, "ERROR: Your kernel probably does not have the proper features. This is a fatal error, exiting now.");
                std::cout << "ERROR: Could not initialize epoll socket engine: " << strerror(errno) << std::endl;
                std::cout << "ERROR: Your kernel probably does not have the proper features. This is a fatal error, exiting now." << std::endl;
-               ServerInstance->Exit(EXIT_STATUS_SOCKETENGINE);
+               ServerInstance->QuickExit(EXIT_STATUS_SOCKETENGINE);
        }
 
        ref = new EventHandler* [GetMaxFds()];