From 8624ff85622a050d1085514534335f93af47e003 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Fri, 18 Nov 2016 10:19:34 +0100 Subject: util.helpers: List event priorities instead of useless array index --- util/helpers.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'util') 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 -- cgit v1.2.3 From 73d36e3ff9d9957737e584aba2841e3ca4621689 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Fri, 18 Nov 2016 10:21:02 +0100 Subject: util.dependencies: Disable warning about Lua 5.2 (but still warn about 5.3) --- util/dependencies.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'util') diff --git a/util/dependencies.lua b/util/dependencies.lua index b3f07257..ca97afb5 100644 --- a/util/dependencies.lua +++ b/util/dependencies.lua @@ -136,7 +136,7 @@ local function check_dependencies() end local function log_warnings() - if _VERSION > "Lua 5.1" then + if _VERSION > "Lua 5.2" then prosody.log("warn", "Support for %s is experimental, please report any issues", _VERSION); end local ssl = softreq"ssl"; -- cgit v1.2.3