From 35589d345eb9dd045f8a1bb46c91fbaab2b5e73f Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Fri, 12 Nov 2021 11:33:09 +0100 Subject: mod_admin_shell: Respect metatables in output serialization Makes it so that returning e.g. util.cache :table() produces useful output, which otherwise would look like empty tables. --- plugins/mod_admin_shell.lua | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'plugins') diff --git a/plugins/mod_admin_shell.lua b/plugins/mod_admin_shell.lua index d9633e83..9fccb5eb 100644 --- a/plugins/mod_admin_shell.lua +++ b/plugins/mod_admin_shell.lua @@ -286,7 +286,8 @@ end -- Anything in def_env will be accessible within the session as a global variable --luacheck: ignore 212/self -local serialize_defaults = module:get_option("console_prettyprint_settings", { fatal = false, unquoted = true, maxdepth = 2}) +local serialize_defaults = module:get_option("console_prettyprint_settings", + { fatal = false; unquoted = true; maxdepth = 2; table_iterator = "pairs" }) def_env.output = {}; function def_env.output:configure(opts) @@ -302,6 +303,11 @@ function def_env.output:configure(opts) opts[k] = v; end end + if opts.table_iterator == "pairs" then + opts.table_iterator = pairs; + elseif type(opts.table_iterator) ~= "function" then + opts.table_iterator = nil; -- rawpairs is the default + end self.session.serialize = serialization.new(opts); end -- cgit v1.2.3