# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1469628354 -3600
# Node ID bad62a7f461fd85617bb98de220033f16ff85e96
# Parent  3c40b972260e72860ce618cd1f74bba51bda8b93# Parent  b6f32bb3b584b2aeebe1ac7452f7683888c18285
Merge 0.10->trunk

diff -r 3c40b972260e -r bad62a7f461f core/statsmanager.lua
--- a/core/statsmanager.lua	Wed Jul 27 14:08:32 2016 +0100
+++ b/core/statsmanager.lua	Wed Jul 27 15:05:54 2016 +0100
@@ -56,15 +56,17 @@
 end
 
 if stats_interval then
-	if stats.get_stats then
-		log("debug", "Statistics collection is enabled every %d seconds", stats_interval);
+	log("debug", "Statistics collection is enabled every %d seconds", stats_interval);
+
+	local mark_collection_start = measure("times", "stats.collection");
+	local mark_processing_start = measure("times", "stats.processing");
 
-		local mark_collection_start = measure("times", "stats.collection");
-		local mark_processing_start = measure("times", "stats.processing");
+	function collect()
+		local mark_collection_done = mark_collection_start();
+		fire_event("stats-update");
+		mark_collection_done();
 
-		function collect()
-			local mark_collection_done = mark_collection_start();
-			fire_event("stats-update");
+		if stats.get_stats then
 			changed_stats, stats_extra = {}, {};
 			for stat_name, getter in pairs(stats.get_stats()) do
 				local type, value, extra = getter();
@@ -77,17 +79,14 @@
 					stats_extra[stat_name] = extra;
 				end
 			end
-			mark_collection_done();
 			local mark_processing_done = mark_processing_start();
 			fire_event("stats-updated", { stats = latest_stats, changed_stats = changed_stats, stats_extra = stats_extra });
 			mark_processing_done();
-			return stats_interval;
 		end
-		timer.add_task(stats_interval, collect);
-		prosody.events.add_handler("server-started", function () collect() end, -1);
-	else
-		log("error", "statistics_interval specified, but the selected statistics_provider (%s) does not support statistics collection", stats_provider_config or "internal");
+		return stats_interval;
 	end
+	timer.add_task(stats_interval, collect);
+	prosody.events.add_handler("server-started", function () collect() end, -1);
 end
 
 if not stats_interval and stats_provider == "util.statistics" then