keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #7509 from annando/admin-queue

Browse source 
Improved calculation of deferred tasks
This commit is contained in:
Hypolite Petovan 2019-08-13 06:40:21 -04:00 committed by GitHub
commit 8b00f48c47
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Core/Worker.php
View file

@ -186,7 +186,7 @@ class Worker
private static function deferredEntries() private static function deferredEntries()
{ {
$stamp = (float)microtime(true); $stamp = (float)microtime(true);
$count = DBA::count('workerqueue', ["NOT `done` AND `pid` = 0 AND `next_try` > ?", DateTimeFormat::utcNow()]); $count = DBA::count('workerqueue', ["NOT `done` AND `pid` = 0 AND `retrial` > ?", 0]);
self::$db_duration += (microtime(true) - $stamp); self::$db_duration += (microtime(true) - $stamp);
self::$db_duration_count += (microtime(true) - $stamp); self::$db_duration_count += (microtime(true) - $stamp);
return $count; return $count;
@ -686,10 +686,8 @@ class Worker
DBA::close($processes); DBA::close($processes);
} }
DBA::close($jobs); DBA::close($jobs);
$entries = $deferred + $waiting_processes;
} else { } else {
$entries = self::totalEntries(); $waiting_processes = self::totalEntries();
$waiting_processes = max(0, $entries - $deferred);
$stamp = (float)microtime(true); $stamp = (float)microtime(true);
$jobs = DBA::p("SELECT COUNT(*) AS `running`, `priority` FROM `process` INNER JOIN `workerqueue` ON `workerqueue`.`pid` = `process`.`pid` AND NOT `done` GROUP BY `priority` ORDER BY `priority`"); $jobs = DBA::p("SELECT COUNT(*) AS `running`, `priority` FROM `process` INNER JOIN `workerqueue` ON `workerqueue`.`pid` = `process`.`pid` AND NOT `done` GROUP BY `priority` ORDER BY `priority`");
self::$db_duration += (microtime(true) - $stamp); self::$db_duration += (microtime(true) - $stamp);