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

Merge pull request #7505 from annando/admin-queue

Browse source 
Queue numbers corrected, only display 999 queue items
This commit is contained in:
Hypolite Petovan 2019-08-12 19:30:57 -04:00 committed by GitHub
commit 2f752b18e1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Module/Admin/Queue.php
View file

@ -30,17 +30,17 @@ class Queue extends BaseAdminModule
// get jobs from the workerqueue table // get jobs from the workerqueue table
if ($deferred) { if ($deferred) {
$condition = ["NOT `done` AND `next_try` > ?", DateTimeFormat::utcNow()]; $condition = ["NOT `done` AND `retrial` > ?", 0];
$sub_title = L10n::t('Inspect Deferred Worker Queue'); $sub_title = L10n::t('Inspect Deferred Worker Queue');
$info = L10n::t("This page lists the deferred worker jobs. This are jobs that couldn't be executed at the first time."); $info = L10n::t("This page lists the deferred worker jobs. This are jobs that couldn't be executed at the first time.");
} else { } else {
$condition = ["NOT `done` AND `next_try` < ?", DateTimeFormat::utcNow()]; $condition = ["NOT `done` AND `retrial` = ?", 0];
$sub_title = L10n::t('Inspect Worker Queue'); $sub_title = L10n::t('Inspect Worker Queue');
$info = L10n::t('This page lists the currently queued worker jobs. These jobs are handled by the worker cronjob you\'ve set up during install.'); $info = L10n::t('This page lists the currently queued worker jobs. These jobs are handled by the worker cronjob you\'ve set up during install.');
} }
// @TODO Move to Model\WorkerQueue::getEntries() // @TODO Move to Model\WorkerQueue::getEntries()
$entries = DBA::select('workerqueue', ['id', 'parameter', 'created', 'priority'], $condition, ['order' => ['priority']]); $entries = DBA::select('workerqueue', ['id', 'parameter', 'created', 'priority'], $condition, ['limit' => 999, 'order' => ['created']]);
$r = []; $r = [];
while ($entry = DBA::fetch($entries)) { while ($entry = DBA::fetch($entries)) {

6
src/Module/Admin/Summary.php
View file

@ -146,11 +146,9 @@ class Summary extends BaseAdminModule
$pending = Register::getPendingCount(); $pending = Register::getPendingCount();
$deferred = DBA::count('workerqueue', ['`executed` <= ? AND NOT `done` AND `next_try` > ?', $deferred = DBA::count('workerqueue', ['NOT `done` AND `retrial` > ?', 0]);
DBA::NULL_DATETIME, DateTimeFormat::utcNow()]);
$workerqueue = DBA::count('workerqueue', ['`executed` <= ? AND NOT `done` AND `next_try` < ?', $workerqueue = DBA::count('workerqueue', ['NOT `done` AND `retrial` = ?', 0]);
DBA::NULL_DATETIME, DateTimeFormat::utcNow()]);
// We can do better, but this is a quick queue status // We can do better, but this is a quick queue status
$queues = ['label' => L10n::t('Message queues'), 'deferred' => $deferred, 'workerq' => $workerqueue]; $queues = ['label' => L10n::t('Message queues'), 'deferred' => $deferred, 'workerq' => $workerqueue];