haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handles async context for all poltergeists 

set up async context for all poltergeist calls
utils lib now has async wrapper for event handlers
This commit is contained in:
Aaron van Meerten 2017-07-20 15:16:29 -05:00
parent 8047fdf5a2
commit 22e9dc9893
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
resources/prosody-plugins/mod_muc_poltergeist.lua
View File

@ -5,6 +5,7 @@ local neturl = require "net.url";
local parse = neturl.parseQuery; local parse = neturl.parseQuery;
local st = require "util.stanza"; local st = require "util.stanza";
local get_room_from_jid = module:require "util".get_room_from_jid; local get_room_from_jid = module:require "util".get_room_from_jid;
local wrap_async_run = module:require "util".wrap_async_run;
local timer = require "util.timer"; local timer = require "util.timer";
-- Options -- Options
@ -430,7 +431,6 @@ function handle_update_poltergeist (event)
local nick = string.sub(username, 0, 8); local nick = string.sub(username, 0, 8);
if (have_poltergeist_occupant(room, nick)) then if (have_poltergeist_occupant(room, nick)) then
update_poltergeist_occupant_status(room, nick, status); update_poltergeist_occupant_status(room, nick, status);
return 200; return 200;
else else
return 404; return 404;
@ -474,15 +474,14 @@ function handle_remove_poltergeist (event)
end end
end end
log("info", "Loading poltergeist service"); log("info", "Loading poltergeist service");
module:depends("http"); module:depends("http");
module:provides("http", { module:provides("http", {
default_path = "/"; default_path = "/";
name = "poltergeist"; name = "poltergeist";
route = { route = {
["GET /poltergeist/create"] = handle_create_poltergeist; ["GET /poltergeist/create"] = function (event) return wrap_async_run(event,handle_create_poltergeist) end;
["GET /poltergeist/update"] = handle_update_poltergeist; ["GET /poltergeist/update"] = function (event) return wrap_async_run(event,handle_update_poltergeist) end;
["GET /poltergeist/remove"] = handle_remove_poltergeist; ["GET /poltergeist/remove"] = function (event) return wrap_async_run(event,handle_remove_poltergeist) end;
}; };
}); });

15
resources/prosody-plugins/util.lib.lua
View File

@ -1,4 +1,5 @@
local jid = require "util.jid"; local jid = require "util.jid";
local runner, waiter = require "util.async".runner, require "util.async".waiter;
--- Finds and returns room by its jid --- Finds and returns room by its jid
-- @param room_jid the room jid to search in the muc component -- @param room_jid the room jid to search in the muc component
@ -20,6 +21,20 @@ function get_room_from_jid(room_jid)
end end
end end
function wrap_async_run(event,handler)
local result;
local async_func = runner(function (event)
local wait, done = waiter();
result=handler(event);
done();
return result;
end)
async_func:run(event)
return result;
end
return { return {
get_room_from_jid = get_room_from_jid; get_room_from_jid = get_room_from_jid;
wrap_async_run = wrap_async_run;
}; };