diff options
| -rw-r--r-- | data/example.conf | 4 | ||||
| -rw-r--r-- | src/init.cpp | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/data/example.conf b/data/example.conf index ea45c70e0..1a9ee7ff3 100644 --- a/data/example.conf +++ b/data/example.conf @@ -305,9 +305,9 @@ options * - m_socketengine_select * - m_socketengine_epoll * - * We recommend using epoll if your operating system supports it. + * We recommend using epoll if your operating system supports it (Linux 2.6+). */ - socketengine = "m_socketengine_epoll" + socketengine = "m_socketengine_select" /* * The maximum length of passwords diff --git a/src/init.cpp b/src/init.cpp index 811981a32..e64a622d9 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -355,7 +355,11 @@ int init_primary(int ac, char **av) ModuleManager::LoadModuleList(Config.DBModuleList); /* Load the socket engine */ - ModuleManager::LoadModule(Config.SocketEngine, NULL); + if (ModuleManager::LoadModule(Config.SocketEngine, NULL)) + { + Alog(LOG_TERMINAL) << "Unable to load socket engine " << Config.SocketEngine; + return -1; + } return 0; } |