From 33f354a68ce9a4d3bd63cc9ad26129a0c2befefa Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Wed, 16 Dec 2015 00:14:53 +0100
Subject: [PATCH] Bugfix for the maximum load check in worker.

---
 include/poller.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/poller.php b/include/poller.php
index fd6f3922aa..b1d6099ad3 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -72,6 +72,10 @@ function poller_run(&$argv, &$argc){
 
 	while ($r = q("SELECT * FROM `workerqueue` WHERE `executed` = '0000-00-00 00:00:00' ORDER BY `created` LIMIT 1")) {
 
+		// Count active workers and compare them with a maximum value that depends on the load
+		if (poller_too_much_workers(3))
+			return;
+
 		q("UPDATE `workerqueue` SET `executed` = '%s', `pid` = %d WHERE `id` = %d AND `executed` = '0000-00-00 00:00:00'",
 			dbesc(datetime_convert()),
 			intval(getmypid()),
@@ -116,10 +120,6 @@ function poller_run(&$argv, &$argc){
 		// Quit the poller once every hour
 		if (time() > ($starttime + 3600))
 			return;
-
-		// Count active workers and compare them with a maximum value that depends on the load
-		if (poller_too_much_workers(3))
-			return;
 	}
 
 }