# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1427819473 -7200
# Node ID 1fa25cfb0ad4fe4c41e1300734c7aa680f53343d
# Parent  7fa0c41792c7bb845dbe91291b6d952969917fb4# Parent  1d96629f5ddab9bbfed8612a7f83782e1765a0a5
Merge

diff -r 7fa0c41792c7 -r 1fa25cfb0ad4 mod_log_events/mod_log_events.lua
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mod_log_events/mod_log_events.lua	Tue Mar 31 18:31:13 2015 +0200
@@ -0,0 +1,13 @@
+module:set_global();
+
+local helpers = require "util.helpers";
+
+helpers.log_events(prosody.events, "global", module._log);
+
+function module.add_host(module)
+	helpers.log_events(prosody.hosts[module.host].events, module.host, module._log);
+end
+
+function module.remove_host(module)
+	helpers.revert_log_events(prosody.hosts[module.host].events);
+end
diff -r 7fa0c41792c7 -r 1fa25cfb0ad4 mod_log_messages_sql/mod_log_messages_sql.lua
--- a/mod_log_messages_sql/mod_log_messages_sql.lua	Mon Mar 30 01:17:35 2015 +0200
+++ b/mod_log_messages_sql/mod_log_messages_sql.lua	Tue Mar 31 18:31:13 2015 +0200
@@ -98,7 +98,11 @@
 	return ...;
 end
 function sql.commit(...)
-	if not connection:commit() then return nil, "SQL commit failed"; end
+	local ok, err = connection:commit();
+	if not ok then
+		module:log("error", "SQL commit failed: %s", tostring(err));
+		return nil, "SQL commit failed: "..tostring(err);
+	end
 	return ...;
 end
 
diff -r 7fa0c41792c7 -r 1fa25cfb0ad4 mod_smacks/mod_smacks.lua
--- a/mod_smacks/mod_smacks.lua	Mon Mar 30 01:17:35 2015 +0200
+++ b/mod_smacks/mod_smacks.lua	Tue Mar 31 18:31:13 2015 +0200
@@ -315,7 +315,9 @@
 		original_session.ip = session.ip;
 		original_session.conn = session.conn;
 		original_session.send = session.send;
-		original_session.send.filter = original_session.filter;
+		original_session.filter = session.filter;
+		original_session.send.filter = session.filter;
+		original_session.data.filter = session.filter;
 		original_session.stream = session.stream;
 		original_session.secure = session.secure;
 		original_session.hibernating = nil;