Add worker queue details (#5375)

* Added Worker queue page

* Added worker queue template

* Added translation strings

* Added en-US translation

* #TGWHT: Thank god we have Typo

* Where donkey == true

* Added in to menu correctly

* Updated link in summary page

* Updated link on summary page for frio theme

* Updated q() to dba::select()

* Revert "Added translation strings"

This reverts commit f1f3694a24.

* Revert "Added en-US translation"

This reverts commit 61777489e3.
This commit is contained in:
Jeroen De Meerleer 2018-07-14 20:01:17 +02:00 committed by Hypolite Petovan
parent 8aee795b45
commit 678efab1c9
4 changed files with 60 additions and 4 deletions

View file

@ -189,7 +189,8 @@ function admin_content(App $a)
'tos' => ["admin/tos/" , L10n::t("Terms of Service") , "tos"] ]], 'tos' => ["admin/tos/" , L10n::t("Terms of Service") , "tos"] ]],
'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;
@ -729,7 +733,7 @@ function admin_page_federation(App $a)
* @brief Admin Inspect Queue Page * @brief Admin Inspect Queue Page
* *
* Generates a page for the admin to have a look into the current queue of * Generates a page for the admin to have a look into the current queue of
* postings that are not deliverabke. Shown are the name and url of the * postings that are not deliverable. Shown are the name and url of the
* recipient, the delivery network and the dates when the posting was generated * recipient, the delivery network and the dates when the posting was generated
* and the last time tried to deliver the posting. * and the last time tried to deliver the posting.
* *
@ -762,6 +766,37 @@ 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 jobs from the workerqueue table
$statement = dba::select('workerqueue', ['id', 'parameter', 'created', 'priority'], ['done' => 0], ['order'=> ['priority']]);
$r = dba::inArray($statement);
$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
* *

View file

@ -11,7 +11,7 @@
<dl> <dl>
<dt>{{$queues.label}}</dt> <dt>{{$queues.label}}</dt>
<dd><a href="{{$baseurl}}/admin/queue">{{$queues.queue}}</a> - {{$queues.workerq}}</dd> <dd><a href="{{$baseurl}}/admin/queue">{{$queues.queue}}</a> - <a href="{{$baseurl}}/admin/workerqueue">{{$queues.workerq}}</a></dd>
</dl> </dl>
<dl> <dl>
<dt>{{$pending.0}}</dt> <dt>{{$pending.0}}</dt>

View file

@ -0,0 +1,21 @@
<div id='adminpage'>
<h1>{{$title}} - {{$page}} ({{$count}})</h1>
<p>{{$info}}</p>
<table>
<tr>
<th>{{$id_header}}</th>
<th>{{$param_header}}</th>
<th>{{$created_header}}</th>
<th>{{$prio_header}}</th>
</tr>
{{foreach $entries as $e}}
<tr>
<td>{{$e.id}}</td>
<td>{{$e.parameter}}</td>
<td>{{$e.created}}</td>
<td>{{$e.priority}}</td>
</tr>
{{/foreach}}
</table>
</div>

View file

@ -14,7 +14,7 @@
{{* The work queues short statistic. *}} {{* The work queues short statistic. *}}
<div id="admin-summary-queues" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 admin-summary"> <div id="admin-summary-queues" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 admin-summary">
<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 admin-summary-label-name text-muted">{{$queues.label}}</div> <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 admin-summary-label-name text-muted">{{$queues.label}}</div>
<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 admin-summary-entry"><a href="{{$baseurl}}/admin/queue">{{$queues.queue}}</a> - {{$queues.workerq}}</div> <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 admin-summary-entry"><a href="{{$baseurl}}/admin/queue">{{$queues.queue}}</a> - <a href="{{$baseurl}}/admin/workerqueue">{{$queues.workerq}}</a></div>
</div> </div>
{{* Number of pending registrations. *}} {{* Number of pending registrations. *}}