From 850f75497ad96223d58399257b94b0fa6db048ce Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Sun, 20 Nov 2016 11:30:26 +0100 Subject: prosody: Set session tables on the 'prosody' global first, then export them as globals --- prosody | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'prosody') diff --git a/prosody b/prosody index 9cc32cee..ad9b04cb 100755 --- a/prosody +++ b/prosody @@ -212,14 +212,14 @@ function set_function_metatable() end function init_global_state() - -- COMPAT: These globals are deprecated - bare_sessions = {}; - full_sessions = {}; - hosts = {}; + prosody.bare_sessions = {}; + prosody.full_sessions = {}; + prosody.hosts = {}; - prosody.bare_sessions = bare_sessions; - prosody.full_sessions = full_sessions; - prosody.hosts = hosts; + -- COMPAT: These globals are deprecated + bare_sessions = prosody.bare_sessions; + full_sessions = prosody.full_sessions; + hosts = prosody.hosts; local data_path = config.get("*", "data_path") or CFG_DATADIR or "data"; local custom_plugin_paths = config.get("*", "plugin_paths"); -- cgit v1.2.3 From 82da87e6299fe7820181dee35ce1b31ca15a6c4f Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Sun, 20 Nov 2016 11:32:05 +0100 Subject: prosody: Add annotations to ignore various globals and unused arguments [luacheck] --- prosody | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'prosody') diff --git a/prosody b/prosody index ad9b04cb..32aeba07 100755 --- a/prosody +++ b/prosody @@ -125,12 +125,17 @@ function check_dependencies() end end +-- luacheck: globals socket server + function load_libraries() -- Load socket framework socket = require "socket"; server = require "net.server" end +-- The global log() gets defined by loggingmanager +-- luacheck: ignore 113/log + function init_logging() -- Initialize logging require "core.loggingmanager" @@ -156,6 +161,7 @@ end function sandbox_require() -- Replace require() with one that doesn't pollute _G, required -- for neat sandboxing of modules + -- luacheck: ignore 113/getfenv 111/require local _realG = _G; local _real_require = require; local getfenv = getfenv or function (f) @@ -172,7 +178,7 @@ function sandbox_require() if curr_env_mt and curr_env_mt.__index and not curr_env_mt.__newindex and _realG_mt then local old_newindex, old_index; old_newindex, _realG_mt.__newindex = _realG_mt.__newindex, curr_env; - old_index, _realG_mt.__index = _realG_mt.__index, function (_G, k) + old_index, _realG_mt.__index = _realG_mt.__index, function (_G, k) -- luacheck: ignore 212/_G return rawget(curr_env, k); end; local ret = _real_require(...); @@ -217,6 +223,7 @@ function init_global_state() prosody.hosts = {}; -- COMPAT: These globals are deprecated + -- luacheck: ignore 111/bare_sessions 111/full_sessions 111/hosts bare_sessions = prosody.bare_sessions; full_sessions = prosody.full_sessions; hosts = prosody.hosts; @@ -349,6 +356,7 @@ end function init_global_protection() -- Catch global accesses + -- luacheck: ignore 212/t local locked_globals_mt = { __index = function (t, k) log("warn", "%s", debug.traceback("Attempt to read a non-existent global '"..tostring(k).."'", 2)); end; __newindex = function (t, k, v) error("Attempt to set a global: "..tostring(k).." = "..tostring(v), 2); end; -- cgit v1.2.3