Software / code / prosody
Diff
plugins/mod_admin_telnet.lua @ 8128:c14513401d65
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 25 Apr 2017 01:42:59 +0200 |
| parent | 7982:e30b0cbed472 |
| parent | 8126:60f6f7ddd2ce |
| child | 8201:a0ad62a269df |
line wrap: on
line diff
--- a/plugins/mod_admin_telnet.lua Mon Apr 24 14:19:49 2017 +0200 +++ b/plugins/mod_admin_telnet.lua Tue Apr 25 01:42:59 2017 +0200 @@ -325,7 +325,7 @@ 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;
