From 5a6fd54f8fd217232f98804431928609580742bc Mon Sep 17 00:00:00 2001
From: Attila Molnar
Date: Sat, 7 Jun 2014 13:47:26 +0200
Subject: Change the number reported by SocketEngine::GetMaxFds() to be
 informal

Do not exit if we can't determine it
---
 src/socketengines/socketengine_ports.cpp | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

(limited to 'src/socketengines/socketengine_ports.cpp')

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)
-- 
cgit v1.3.1-10-gc9f91