strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Bugfix for the maximum load check in worker.

Browse source
This commit is contained in:
Michael Vogel 2015-12-16 00:14:53 +01:00
parent 6e03477598
commit 33f354a68c
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
include/poller.php
View file

@ -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")) { 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'", q("UPDATE `workerqueue` SET `executed` = '%s', `pid` = %d WHERE `id` = %d AND `executed` = '0000-00-00 00:00:00'",
dbesc(datetime_convert()), dbesc(datetime_convert()),
intval(getmypid()), intval(getmypid()),
@ -116,10 +120,6 @@ function poller_run(&$argv, &$argc){
// Quit the poller once every hour // Quit the poller once every hour
if (time() > ($starttime + 3600)) if (time() > ($starttime + 3600))
return; return;
// Count active workers and compare them with a maximum value that depends on the load
if (poller_too_much_workers(3))
return;
} }
} }