diff options
| author |  Attila Molnar | 2014-06-07 13:47:26 +0200 |
|---|---|---|
| committer | Attila Molnar | 2014-06-07 13:47:26 +0200 |
| commit | 5a6fd54f8fd217232f98804431928609580742bc (patch) | |
| tree | 8bed7bfab1526fcd1ef691d2483cbb9400dcfd72 /src/socketengines/socketengine_ports.cpp | |
| parent | socketengine_epoll Pass a dummy value to epoll_create() that does not depend ... (diff) | |
Change the number reported by SocketEngine::GetMaxFds() to be informal
Do not exit if we can't determine it
Diffstat (limited to 'src/socketengines/socketengine_ports.cpp')
| -rw-r--r-- | src/socketengines/socketengine_ports.cpp | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/src/socketengines/socketengine_ports.cpp b/src/socketengines/socketengine_ports.cpp index deafd8fcb..c6ddb041c 100644 --- a/src/socketengines/socketengine_ports.cpp +++ b/src/socketengines/socketengine_ports.cpp @@ -48,17 +48,9 @@ namespace */ void SocketEngine::Init() { - int max = ulimit(4, 0); - if (max > 0) - { - MAX_DESCRIPTORS = max; - } - else - { - ServerInstance->Logs->Log("SOCKET", LOG_DEFAULT, "ERROR: Can't determine maximum number of open sockets!"); - std::cout << "ERROR: Can't determine maximum number of open sockets!" << std::endl; - ServerInstance->QuickExit(EXIT_STATUS_SOCKETENGINE); - } + // MAX_DESCRIPTORS is mainly used for display purposes, no problem if ulimit() fails and returns a negative number + MAX_DESCRIPTORS = ulimit(4, 0); + EngineHandle = port_create(); if (EngineHandle == -1) |