# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1472657121 -3600
# Node ID e9d7a409e236391d41f27a608dc8479b23b32bf1
# Parent  5eef792bb2e1db196674d2fd62df90bd8207759a# Parent  6210dfaec84fa95f1669aaa9baa0a0a3cb504795
Merge 0.10->trunk

diff -r 5eef792bb2e1 -r e9d7a409e236 core/moduleapi.lua
--- a/core/moduleapi.lua	Tue Aug 30 17:54:24 2016 +0200
+++ b/core/moduleapi.lua	Wed Aug 31 16:25:21 2016 +0100
@@ -431,7 +431,7 @@
 end
 
 function api:measure_object_event(events_object, event_name, stat_name)
-	local m = self:measure(stat_name or event_name, "duration");
+	local m = self:measure(stat_name or event_name, "times");
 	local function handler(handlers, _event_name, _event_data)
 		local finished = m();
 		local ret = handlers(_event_name, _event_data);
diff -r 5eef792bb2e1 -r e9d7a409e236 core/storagemanager.lua
--- a/core/storagemanager.lua	Tue Aug 30 17:54:24 2016 +0200
+++ b/core/storagemanager.lua	Wed Aug 31 16:25:21 2016 +0100
@@ -153,14 +153,19 @@
 		if err == "unsupported-store" then
 			if typ == "map" then -- Use shim on top of keyval store
 				log("debug", "map storage driver unavailable, using shim on top of keyval store.");
-				return create_map_shim(host, store);
+				ret, err = create_map_shim(host, store);
+			else
+				log("debug", "Storage driver %s does not support store %s (%s), falling back to null driver",
+					driver_name, store, typ or "<nil>");
+				ret, err = null_storage_driver, nil;
 			end
-			log("debug", "Storage driver %s does not support store %s (%s), falling back to null driver",
-				driver_name, store, typ or "<nil>");
-			ret = null_storage_driver;
-			err = nil;
 		end
 	end
+	if ret then
+		local event_data = { host = host, store_name = store, store_type = typ, store = ret };
+		prosody.hosts[host].events.fire_event("store-opened", event_data);
+		ret, err = event_data.store, event_data.store_err;
+	end
 	return ret, err;
 end
 
diff -r 5eef792bb2e1 -r e9d7a409e236 plugins/mod_s2s/mod_s2s.lua
--- a/plugins/mod_s2s/mod_s2s.lua	Tue Aug 30 17:54:24 2016 +0200
+++ b/plugins/mod_s2s/mod_s2s.lua	Wed Aug 31 16:25:21 2016 +0100
@@ -665,7 +665,6 @@
 			if s2sout.attempt_connection(session, err) then
 				return; -- Session lives for now
 			end
-			hosts[session.from_host].events.fire_event("s2s-connect-failure", { session = session, err = err });
 		end
 		(session.log or log)("debug", "s2s disconnected: %s->%s (%s)", tostring(session.from_host), tostring(session.to_host), tostring(err or "connection closed"));
 		s2s_destroy_session(session, err);