aboutsummaryrefslogtreecommitdiffstats
path: root/core/s2smanager.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-03-06 01:14:32 +0100
committerKim Alvefur <zash@zash.se>2017-03-06 01:14:32 +0100
commit0e71fac1d18b0de0e9203cb6b71c971d55c8c70c (patch)
treee58db2bf464bf09301a9c02c27330c2dba6b926d /core/s2smanager.lua
parent2ca03f1a40ea0854e0dda798b82e31c558eed578 (diff)
parent91d2b2518f3e3d047dc43f59db3f7025d29ab86c (diff)
downloadprosody-0e71fac1d18b0de0e9203cb6b71c971d55c8c70c.tar.gz
prosody-0e71fac1d18b0de0e9203cb6b71c971d55c8c70c.zip
Merge 0.10->trunk
Diffstat (limited to 'core/s2smanager.lua')
-rw-r--r--core/s2smanager.lua4
1 files changed, 3 insertions, 1 deletions
diff --git a/core/s2smanager.lua b/core/s2smanager.lua
index abeaa646..1e8b1120 100644
--- a/core/s2smanager.lua
+++ b/core/s2smanager.lua
@@ -71,7 +71,9 @@ end
local function destroy_session(session, reason)
if session.destroyed then return; end
- (session.log or log)("debug", "Destroying "..tostring(session.direction).." session "..tostring(session.from_host).."->"..tostring(session.to_host)..(reason and (": "..reason) or ""));
+ (session.log or log)("debug", "Destroying "..tostring(session.direction)
+ .." session "..tostring(session.from_host).."->"..tostring(session.to_host)
+ ..(reason and (": "..reason) or ""));
if session.direction == "outgoing" then
hosts[session.from_host].s2sout[session.to_host] = nil;