tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Added Worker queue page

Browse source
This commit is contained in:
Jeroen De Meerleer 2018-07-14 18:15:08 +02:00
parent 30cef1a739
commit 763f3bf8f7
1 changed files with 36 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
mod/admin.php
View file

@ -190,6 +190,7 @@ function admin_content(App $a)
'database' => [ L10n::t('Database'), [ 'database' => [ L10n::t('Database'), [
'dbsync' => ["admin/dbsync/" , L10n::t('DB updates') , "dbsync"], 'dbsync' => ["admin/dbsync/" , L10n::t('DB updates') , "dbsync"],
'queue' => ["admin/queue/" , L10n::t('Inspect Queue') , "queue"], ]], 'queue' => ["admin/queue/" , L10n::t('Inspect Queue') , "queue"], ]],
'workerqueue' => ["admin/workerqueue/" , L10n::t('Inspect worker Queue') , "workerqueue"], ]],
'tools' => [ L10n::t('Tools'), [ 'tools' => [ L10n::t('Tools'), [
'contactblock' => ["admin/contactblock/", L10n::t('Contact Blocklist') , "contactblock"], 'contactblock' => ["admin/contactblock/", L10n::t('Contact Blocklist') , "contactblock"],
'blocklist' => ["admin/blocklist/" , L10n::t('Server Blocklist') , "blocklist"], 'blocklist' => ["admin/blocklist/" , L10n::t('Server Blocklist') , "blocklist"],
@ -258,6 +259,9 @@ function admin_content(App $a)
case 'queue': case 'queue':
$o = admin_page_queue($a); $o = admin_page_queue($a);
break; break;
case 'workerqueue':
$o = admin_page_workerqueue($a);
break;
case 'federation': case 'federation':
$o = admin_page_federation($a); $o = admin_page_federation($a);
break; break;
@ -762,6 +766,38 @@ function admin_page_queue(App $a)
]); ]);
} }
/**
* @brief Admin Inspect Worker 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.
*
* The returned string holds the content of the page.
*
* @param App $a
* @return string
*/
function admin_page_workerqueue(App $a)
{
// get content from the queue table
$r = q("SELECT `q`.`id`,`q`.`parameter`, `q`.`created`, `q`.`priority`
FROM `workerqueue` AS `q`
ORDER BY `q`.`priority`;");
$t = get_markup_template('admin/workerqueue.tpl');
return replace_macros($t, [
'$title' => L10n::t('Administration'),
'$page' => L10n::t('Inspect Worker Queue'),
'$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' => 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' => $r,
]);
}
/** /**
* @brief Admin Summary Page * @brief Admin Summary Page
* *