diff options
| author | Kim Alvefur <zash@zash.se> | 2017-04-25 01:42:59 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2017-04-25 01:42:59 +0200 |
| commit | d10300eca4067bdc68a16675a4065f608c88381d (patch) | |
| tree | 76b402f43306dd2f1a20dd5b16f9fe1bf9c15a42 /plugins/mod_admin_telnet.lua | |
| parent | 706849aa1ef9f5f2f6494d14d7de0ac9e1647190 (diff) | |
| parent | 237f991e4f843ea2448fac2563149b6671e5c885 (diff) | |
| download | prosody-d10300eca4067bdc68a16675a4065f608c88381d.tar.gz prosody-d10300eca4067bdc68a16675a4065f608c88381d.zip | |
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_admin_telnet.lua')
| -rw-r--r-- | plugins/mod_admin_telnet.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/mod_admin_telnet.lua b/plugins/mod_admin_telnet.lua index 2f5d9f63..eae72e61 100644 --- a/plugins/mod_admin_telnet.lua +++ b/plugins/mod_admin_telnet.lua @@ -325,7 +325,7 @@ end function def_env.server:memory() if not has_pposix or not pposix.meminfo then - return true, "Lua is using "..collectgarbage("count"); + return true, "Lua is using "..human(collectgarbage("count")); end local mem, lua_mem = pposix.meminfo(), collectgarbage("count"); local print = self.session.print; |