mirror of
https://github.com/friendica/friendica
synced 2025-04-24 23:10:11 +00:00
Move admin/queue to src/Module
- Add Module\Admin\Queue class - Add route for admin/queue[/deferred] - Add queue admin aside menu entry - Remove obsolete templates/admin/queue.tpl from base and frio - Move templates/admin/workerqueue.tpl to templates/admin/queue.tpl - Remove admin_page_workerqueue and admin_page_workerqueue_post from mod/admin.php - Update admin/summary.tpl with new queue admin paths
This commit is contained in:
parent
5750623b48
commit
5a01c53781
10 changed files with 82 additions and 117 deletions
66
src/Module/Admin/Queue.php
Normal file
66
src/Module/Admin/Queue.php
Normal file
|
@ -0,0 +1,66 @@
|
|||
<?php
|
||||
|
||||
namespace Friendica\Module\Admin;
|
||||
|
||||
use Friendica\Core\L10n;
|
||||
use Friendica\Core\Renderer;
|
||||
use Friendica\Database\DBA;
|
||||
use Friendica\Module\BaseAdminModule;
|
||||
use Friendica\Util\Arrays;
|
||||
use Friendica\Util\DateTimeFormat;
|
||||
|
||||
/**
|
||||
* @brief 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.
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
class Queue extends BaseAdminModule
|
||||
{
|
||||
public static function content()
|
||||
{
|
||||
parent::content();
|
||||
|
||||
$a = self::getApp();
|
||||
|
||||
// @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.");
|
||||
} 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.');
|
||||
}
|
||||
|
||||
$entries = DBA::select('workerqueue', ['id', 'parameter', 'created', 'priority'], $condition, ['order' => ['priority']]);
|
||||
|
||||
$r = [];
|
||||
while ($entry = DBA::fetch($entries)) {
|
||||
// fix GH-5469. ref: src/Core/Worker.php:217
|
||||
$entry['parameter'] = Arrays::recursiveImplode(json_decode($entry['parameter'], true), ': ');
|
||||
$entry['created'] = DateTimeFormat::local($entry['created']);
|
||||
$r[] = $entry;
|
||||
}
|
||||
DBA::close($entries);
|
||||
|
||||
$t = Renderer::getMarkupTemplate('admin/queue.tpl');
|
||||
return Renderer::replaceMacros($t, [
|
||||
'$title' => 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'),
|
||||
'$info' => $info,
|
||||
'$entries' => $r,
|
||||
]);
|
||||
}
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue