Merge pull request #7743 from MrPetovan/task/7190-remove-defaults-modules

[friendica.git] / src / Module / Admin / Summary.php

diff --git a/src/Module/Admin/Summary.php b/src/Module/Admin/Summary.php
index 6261ac75caf937057c7ffacf8906726e013d4b8e..d0bb4347a17ae016a6596e84b1112858bd941893 100644 (file)
--- a/src/Module/Admin/Summary.php
+++ b/src/Module/Admin/Summary.php
@@ -12,7 +12,7 @@ use Friendica\Database\DBA;
 use Friendica\Database\DBStructure;
 use Friendica\Model\Register;
 use Friendica\Module\BaseAdminModule;
-use Friendica\Util\Config\ConfigFileLoader;
+use Friendica\Util\ConfigFileLoader;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
 
@@ -146,16 +146,12 @@ class Summary extends BaseAdminModule
 
                $pending = Register::getPendingCount();
 
-               $queue = DBA::count('queue', []);
+               $deferred = DBA::count('workerqueue', ['NOT `done` AND `retrial` > ?', 0]);
 
-               $deferred = DBA::count('workerqueue', ['`executed` <= ? AND NOT `done` AND `next_try` > ?',
-                       DBA::NULL_DATETIME, DateTimeFormat::utcNow()]);
-
-               $workerqueue = DBA::count('workerqueue', ['`executed` <= ? AND NOT `done` AND `next_try` < ?',
-                       DBA::NULL_DATETIME, DateTimeFormat::utcNow()]);
+               $workerqueue = DBA::count('workerqueue', ['NOT `done` AND `retrial` = ?', 0]);
 
                // We can do better, but this is a quick queue status
-               $queues = ['label' => L10n::t('Message queues'), 'queue' => $queue, 'deferred' => $deferred, 'workerq' => $workerqueue];
+               $queues = ['label' => L10n::t('Message queues'), 'deferred' => $deferred, 'workerq' => $workerqueue];
 
                $variables = DBA::toArray(DBA::p('SHOW variables LIKE "max_allowed_packet"'));
                $max_allowed_packet = $variables ? $variables[0]['Value'] : 0;