diff options
author | Kim Alvefur <zash@zash.se> | 2015-09-19 17:51:20 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2015-09-19 17:51:20 +0200 |
commit | 9b97c52790a17ea25e0e7ab96fe62280e4dbfea8 (patch) | |
tree | 47cf9d27ab4a9fef0167cf77f3674b183d9837fc /plugins | |
parent | 26c4421db4127e1b62fbe90f027803bfc855f387 (diff) | |
parent | f2c69ab1c34060bafbf172915bc8c160bb086af2 (diff) | |
download | prosody-9b97c52790a17ea25e0e7ab96fe62280e4dbfea8.tar.gz prosody-9b97c52790a17ea25e0e7ab96fe62280e4dbfea8.zip |
Merge 0.10->trunk
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/mod_admin_telnet.lua | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/plugins/mod_admin_telnet.lua b/plugins/mod_admin_telnet.lua index 7523ec52..16b16e88 100644 --- a/plugins/mod_admin_telnet.lua +++ b/plugins/mod_admin_telnet.lua @@ -830,19 +830,19 @@ function def_env.s2s:close(from, to) (session.close or s2smanager.destroy_session)(session); count = count + 1 ; end - end + end return true, "Closed "..count.." s2s session"..((count == 1 and "") or "s"); end function def_env.s2s:closeall(host) - local count = 0; + local count = 0; local s2s_sessions = module:shared"/*/s2s/sessions"; for _,session in pairs(s2s_sessions) do if not host or session.from_host == host or session.to_host == host then session:close(); - count = count + 1; - end - end + count = count + 1; + end + end if count == 0 then return false, "No sessions to close."; else return true, "Closed "..count.." s2s session"..((count == 1 and "") or "s"); end end |