Merge 0.10->trunk

author: Kim Alvefur <zash@zash.se>
date: Mon, 06 Mar 2017 01:14:32 +0100
parent: 7786:b62353e6a8e5
parent: 7949:8acc35b5355a
child: 8185:e89320b8a789
--- a/core/sessionmanager.lua	Fri Mar 03 11:52:22 2017 +0100
+++ b/core/sessionmanager.lua	Mon Mar 06 01:14:32 2017 +0100
@@ -5,6 +5,7 @@
 -- This project is MIT/X11 licensed. Please see the
 -- COPYING file in the source package for more information.
 --
+-- luacheck: globals prosody.full_sessions prosody.bare_sessions
 
 local tostring, setmetatable = tostring, setmetatable;
 local pairs, next= pairs, next;
@@ -77,7 +78,10 @@
 end
 
 local function destroy_session(session, err)
-	(session.log or log)("debug", "Destroying session for %s (%s@%s)%s", session.full_jid or "(unknown)", session.username or "(unknown)", session.host or "(unknown)", err and (": "..err) or "");
+	(session.log or log)("debug", "Destroying session for %s (%s@%s)%s",
+		session.full_jid or "(unknown)", session.username or "(unknown)",
+		session.host or "(unknown)", err and (": "..err) or "");
+
 	if session.destroyed then return; end
 
 	-- Remove session/resource from user's session list