diff options
| author | Kim Alvefur <zash@zash.se> | 2017-04-25 00:14:19 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2017-04-25 00:14:19 +0200 |
| commit | 14df21dc9b9f3dc091d9bff4139c600ae00642b6 (patch) | |
| tree | 7f0d1c0d71e3a3dd777f986892bd6d811c7f755c | |
| parent | 47c821cf549c8ea4645190a8f4bb18b7a2eaee2b (diff) | |
| download | prosody-14df21dc9b9f3dc091d9bff4139c600ae00642b6.tar.gz prosody-14df21dc9b9f3dc091d9bff4139c600ae00642b6.zip | |
mod_admin_telnet: Output human-friendly memory usage when meminfo is unavailable (thanks nbastin)
| -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 04e93d7e..293f6320 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; |