aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2009-09-24 23:47:16 +0100
committerMatthew Wild <mwild1@gmail.com>2009-09-24 23:47:16 +0100
commit23d676ee18f898b0db00358a1679bf8e56ef043b (patch)
tree9d561aa1d754e84bf2cfedffa1978bb5ebcc6bf9 /plugins
parentc0f6d946e15e28b820fd7c0f301719c4c4425383 (diff)
parent9118f712274368d5794fb8b8a2831f678ae1c15b (diff)
downloadprosody-23d676ee18f898b0db00358a1679bf8e56ef043b.tar.gz
prosody-23d676ee18f898b0db00358a1679bf8e56ef043b.zip
Merge with 0.5
Diffstat (limited to 'plugins')
-rw-r--r--plugins/mod_console.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/mod_console.lua b/plugins/mod_console.lua
index c0f491de..e8d31ceb 100644
--- a/plugins/mod_console.lua
+++ b/plugins/mod_console.lua
@@ -515,7 +515,7 @@ function def_env.s2s:close(from, to)
if not session then
print("No outgoing connection from "..from.." to "..to)
else
- s2smanager.destroy_session(session);
+ (session.close or s2smanager.destroy_session)(session);
count = count + 1;
print("Closed outgoing session from "..from.." to "..to);
end
@@ -523,7 +523,7 @@ function def_env.s2s:close(from, to)
-- Is an incoming connection
for session in pairs(incoming_s2s) do
if session.to_host == to and session.from_host == from then
- s2smanager.destroy_session(session);
+ (session.close or s2smanager.destroy_session)(session);
count = count + 1;
end
end