prosody
339a96689dcb
net/server.lua

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Comparison

net/server.lua @ 2164:339a96689dcb

Merge with trunk
author Matthew Wild <mwild1@gmail.com>
date Tue, 24 Nov 2009 20:35:18 +0000
parent 2162:22b6b1899a55
child 2281:27441b099984
comparison
equal deleted inserted replaced
2163:8d33f94dc3a1 2164:339a96689dcb
1 local have_luaevent = pcall(require, "luaevent.core"); 1
2 local use_luaevent = require "core.configmanager".get("*", "core", "use_libevent"); 2 local use_luaevent = require "core.configmanager".get("*", "core", "use_libevent");
3
4 if use_luaevent then
5 use_luaevent = pcall(require, "luaevent.core");
6 if not use_luaevent then
7 log("error", "libevent not found, falling back to select()");
8 end
9 end
3 10
4 local server; 11 local server;
5 12
6 if have_luaevent and use_luaevent == true then 13 if use_luaevent then
7 server = require "net.server_event"; 14 server = require "net.server_event";
8 -- util.timer requires "net.server", so instead of having 15 -- util.timer requires "net.server", so instead of having
9 -- Lua look for, and load us again (causing a loop) - set this here 16 -- Lua look for, and load us again (causing a loop) - set this here
10 -- (usually it isn't set until we return, look down there...) 17 -- (usually it isn't set until we return, look down there...)
11 package.loaded["net.server"] = server; 18 package.loaded["net.server"] = server;