namespace Friendica\Module\Admin;
-use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\Database\DBA;
+use Friendica\DI;
use Friendica\Module\BaseAdminModule;
use Friendica\Util\Arrays;
use Friendica\Util\DateTimeFormat;
/**
- * @brief Admin Inspect Queue Page
+ * Admin Inspect Queue Page
*
* Generates a page for the admin to have a look into the current queue of
* worker jobs. Shown are the parameters for the job and its priority.
*/
class Queue extends BaseAdminModule
{
- public static function content()
+ public static function content(array $parameters = [])
{
- parent::content();
+ parent::content($parameters);
- $a = self::getApp();
+ $a = DI::app();
// @TODO: Replace with parameter from router
$deferred = $a->argc > 2 && $a->argv[2] == 'deferred';
// get jobs from the workerqueue table
if ($deferred) {
- $condition = ["NOT `done` AND `next_try` > ?", DateTimeFormat::utcNow()];
- $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.");
+ $condition = ["NOT `done` AND `retrial` > ?", 0];
+ $sub_title = DI::l10n()->t('Inspect Deferred Worker Queue');
+ $info = DI::l10n()->t("This page lists the deferred worker jobs. This are jobs that couldn't be executed at the first time.");
} else {
- $condition = ["NOT `done` AND `next_try` < ?", DateTimeFormat::utcNow()];
- $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.');
+ $condition = ["NOT `done` AND `retrial` = ?", 0];
+ $sub_title = DI::l10n()->t('Inspect Worker Queue');
+ $info = DI::l10n()->t('This page lists the currently queued worker jobs. These jobs are handled by the worker cronjob you\'ve set up during install.');
}
- $entries = DBA::select('workerqueue', ['id', 'parameter', 'created', 'priority'], $condition, ['order' => ['priority']]);
+ // @TODO Move to Model\WorkerQueue::getEntries()
+ $entries = DBA::select('workerqueue', ['id', 'parameter', 'created', 'priority'], $condition, ['limit' => 999, 'order' => ['created']]);
$r = [];
while ($entry = DBA::fetch($entries)) {
$t = Renderer::getMarkupTemplate('admin/queue.tpl');
return Renderer::replaceMacros($t, [
- '$title' => L10n::t('Administration'),
+ '$title' => DI::l10n()->t('Administration'),
'$page' => $sub_title,
'$count' => count($r),
- '$id_header' => L10n::t('ID'),
- '$param_header' => L10n::t('Job Parameters'),
- '$created_header' => L10n::t('Created'),
- '$prio_header' => L10n::t('Priority'),
+ '$id_header' => DI::l10n()->t('ID'),
+ '$param_header' => DI::l10n()->t('Job Parameters'),
+ '$created_header' => DI::l10n()->t('Created'),
+ '$prio_header' => DI::l10n()->t('Priority'),
'$info' => $info,
'$entries' => $r,
]);