Merge 0.12->trunk
authorKim Alvefur <zash@zash.se>
Thu, 05 May 2022 14:15:15 +0200
changeset 12494 1c5cb4c49c50
parent 12491 db634db8e069 (current diff)
parent 12493 8b42575738f0 (diff)
child 12496 a44c328028ad
Merge 0.12->trunk
--- a/plugins/mod_cron.lua	Wed Apr 27 21:45:36 2022 +0200
+++ b/plugins/mod_cron.lua	Thu May 05 14:15:15 2022 +0200
@@ -45,6 +45,7 @@
 local function run_task(task)
 	local started_at = os.time();
 	task:run(started_at);
+	task.last = started_at;
 	task:save(started_at);
 end
 
--- a/teal-src/plugins/mod_cron.tl	Wed Apr 27 21:45:36 2022 +0200
+++ b/teal-src/plugins/mod_cron.tl	Thu May 05 14:15:15 2022 +0200
@@ -84,6 +84,7 @@
 local function run_task(task : task_spec)
 	local started_at = os.time();
 	task:run(started_at);
+	task.last = started_at;
 	task:save(started_at);
 end
 
--- a/util/prosodyctl/check.lua	Wed Apr 27 21:45:36 2022 +0200
+++ b/util/prosodyctl/check.lua	Thu May 05 14:15:15 2022 +0200
@@ -1277,6 +1277,7 @@
 			local count = it.count(pairs(turn_services));
 			if count == 0 then
 				print("Error: Unable to find any TURN services configured. Enable mod_turn_external!");
+				ok = false;
 			else
 				print("Identified "..tostring(count).." TURN services.");
 				print("");