diff options
author | Kim Alvefur <zash@zash.se> | 2016-11-19 01:05:36 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-11-19 01:05:36 +0100 |
commit | d8aafa0efe7e6106b663c4f76b4e8cde33fe8944 (patch) | |
tree | 10c5a2294941641099a92c40f24081bcf121cd8f /util/helpers.lua | |
parent | fd894fe73e9890435a1c0ec97b660c888ac38e3b (diff) | |
parent | f043b0f7eaed6fad1430f149278b37d2e2a2010c (diff) | |
download | prosody-d8aafa0efe7e6106b663c4f76b4e8cde33fe8944.tar.gz prosody-d8aafa0efe7e6106b663c4f76b4e8cde33fe8944.zip |
Merge 0.10->trunk
Diffstat (limited to 'util/helpers.lua')
-rw-r--r-- | util/helpers.lua | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/util/helpers.lua b/util/helpers.lua index bf76d258..eb38f653 100644 --- a/util/helpers.lua +++ b/util/helpers.lua @@ -43,14 +43,14 @@ local function show_events(events, specific_event) local event_handlers = events._handlers; local events_array = {}; local event_handler_arrays = {}; - for event in pairs(events._event_map) do + for event, priorities in pairs(events._event_map) do local handlers = event_handlers[event]; if handlers and (event == specific_event or not specific_event) then table.insert(events_array, event); local handler_strings = {}; for i, handler in ipairs(handlers) do local upvals = debug.string_from_var_table(debug.get_upvalues_table(handler)); - handler_strings[i] = " "..i..": "..tostring(handler)..(upvals and ("\n "..upvals) or ""); + handler_strings[i] = " "..priorities[handler]..": "..tostring(handler)..(upvals and ("\n "..upvals) or ""); end event_handler_arrays[event] = handler_strings; end |