diff options
| author | Matthew Wild <mwild1@gmail.com> | 2016-01-02 20:42:53 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2016-01-02 20:42:53 +0000 |
| commit | 6d5bf3651160efa69fb89bd2f92b11f7d69f4034 (patch) | |
| tree | cb3e8bce329accde5bcfa6c8138f4868a7aa9c58 | |
| parent | b70c2783801a3fa01d498432f74de66a770636cd (diff) | |
| parent | e5691fed7972bf6c0d4e0e494f79850322b794c4 (diff) | |
| download | prosody-6d5bf3651160efa69fb89bd2f92b11f7d69f4034.tar.gz prosody-6d5bf3651160efa69fb89bd2f92b11f7d69f4034.zip | |
Merge 0.10->trunk
| -rw-r--r-- | net/server_event.lua | 1 | ||||
| -rw-r--r-- | net/server_select.lua | 1 | ||||
| -rw-r--r-- | util/events.lua | 5 |
3 files changed, 7 insertions, 0 deletions
diff --git a/net/server_event.lua b/net/server_event.lua index 9b1ffb25..67758664 100644 --- a/net/server_event.lua +++ b/net/server_event.lua @@ -614,6 +614,7 @@ local function handleserver( server, addr, port, pattern, listener, sslctx ) -- local interface = { _connections = 0; + type = "server"; conn = server; onconnect = listener.onconnect; -- will be called when new client connected eventread = false; -- read event handler diff --git a/net/server_select.lua b/net/server_select.lua index 35dcb5a7..ced73074 100644 --- a/net/server_select.lua +++ b/net/server_select.lua @@ -934,6 +934,7 @@ loop = function(once) -- this is the main loop of the program end until quitting; if once and quitting == "once" then quitting = nil; return; end + closeall(); return "quitting" end diff --git a/util/events.lua b/util/events.lua index 825ffb19..073d2a60 100644 --- a/util/events.lua +++ b/util/events.lua @@ -17,10 +17,15 @@ local next = next; local _ENV = nil; local function new() + -- Map event name to ordered list of handlers (lazily built): handlers[event_name] = array_of_handler_functions local handlers = {}; + -- Array of wrapper functions that wrap all events (nil if empty) local global_wrappers; + -- Per-event wrappers: wrappers[event_name] = wrapper_function local wrappers = {}; + -- Event map: event_map[handler_function] = priority_number local event_map = {}; + -- Called on-demand to build handlers entries local function _rebuild_index(handlers, event) local _handlers = event_map[event]; if not _handlers or next(_handlers) == nil then return; end |