From 3d08f189a3c6b83515273e99d7dca72693b8971a Mon Sep 17 00:00:00 2001 From: Waqas Hussain Date: Tue, 24 Nov 2009 14:37:14 +0500 Subject: net.server: Log an error when libevent is requested, but luaevent is unavailable, and don't load luaevent when not requested. --- net/server.lua | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'net/server.lua') diff --git a/net/server.lua b/net/server.lua index a2325735..f77b216d 100644 --- a/net/server.lua +++ b/net/server.lua @@ -1,9 +1,16 @@ -local have_luaevent = pcall(require, "luaevent.core"); + local use_luaevent = require "core.configmanager".get("*", "core", "use_libevent"); +if use_luaevent then + use_luaevent = pcall(require, "luaevent.core"); + if not use_luaevent then + log("error", "libevent not found, falling back to select()"); + end +end + local server; -if have_luaevent and use_luaevent == true then +if use_luaevent then server = require "net.server_event"; -- util.timer requires "net.server", so instead of having -- Lua look for, and load us again (causing a loop) - set this here -- cgit v1.2.3