case 'dbsync':
$o = admin_page_dbsync($a);
break;
- case 'deferred':
- $o = admin_page_workerqueue($a, true);
- break;
- case 'workerqueue':
- $o = admin_page_workerqueue($a, false);
- break;
case 'deleteitem':
$o = admin_page_deleteitem($a);
break;
return; // NOTREACHED
}
-/**
- * @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
- * @param $deferred
- * @return string
- * @throws \Friendica\Network\HTTPException\InternalServerErrorException
- */
-function admin_page_workerqueue(App $a, $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/workerqueue.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,
- ]);
-}
-
/**
* @brief Process send data from Admin Site Page
*
$collector->addRoute(['GET', 'POST'], '/features' , Module\Admin\Features::class);
$collector->addRoute(['GET'] , '/federation' , Module\Admin\Federation::class);
+ $collector->addRoute(['GET'] , '/queue[/deferred]' , Module\Admin\Queue::class);
+
$collector->addRoute(['GET', 'POST'], '/themes' , Module\Admin\Themes\Index::class);
$collector->addRoute(['GET', 'POST'], '/tos' , Module\Admin\Tos::class);
--- /dev/null
+<?php\r
+\r
+namespace Friendica\Module\Admin;\r
+\r
+use Friendica\Core\L10n;\r
+use Friendica\Core\Renderer;\r
+use Friendica\Database\DBA;\r
+use Friendica\Module\BaseAdminModule;\r
+use Friendica\Util\Arrays;\r
+use Friendica\Util\DateTimeFormat;\r
+\r
+/**\r
+ * @brief Admin Inspect Queue Page\r
+ *\r
+ * Generates a page for the admin to have a look into the current queue of\r
+ * worker jobs. Shown are the parameters for the job and its priority.\r
+ *\r
+ * @return string\r
+ */\r
+class Queue extends BaseAdminModule\r
+{\r
+ public static function content()\r
+ {\r
+ parent::content();\r
+\r
+ $a = self::getApp();\r
+\r
+ // @TODO: Replace with parameter from router\r
+ $deferred = $a->argc > 2 && $a->argv[2] == 'deferred';\r
+\r
+ // get jobs from the workerqueue table\r
+ if ($deferred) {\r
+ $condition = ["NOT `done` AND `next_try` > ?", DateTimeFormat::utcNow()];\r
+ $sub_title = L10n::t('Inspect Deferred Worker Queue');\r
+ $info = L10n::t("This page lists the deferred worker jobs. This are jobs that couldn't be executed at the first time.");\r
+ } else {\r
+ $condition = ["NOT `done` AND `next_try` < ?", DateTimeFormat::utcNow()];\r
+ $sub_title = L10n::t('Inspect Worker Queue');\r
+ $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.');\r
+ }\r
+\r
+ $entries = DBA::select('workerqueue', ['id', 'parameter', 'created', 'priority'], $condition, ['order' => ['priority']]);\r
+\r
+ $r = [];\r
+ while ($entry = DBA::fetch($entries)) {\r
+ // fix GH-5469. ref: src/Core/Worker.php:217\r
+ $entry['parameter'] = Arrays::recursiveImplode(json_decode($entry['parameter'], true), ': ');\r
+ $entry['created'] = DateTimeFormat::local($entry['created']);\r
+ $r[] = $entry;\r
+ }\r
+ DBA::close($entries);\r
+\r
+ $t = Renderer::getMarkupTemplate('admin/queue.tpl');\r
+ return Renderer::replaceMacros($t, [\r
+ '$title' => L10n::t('Administration'),\r
+ '$page' => $sub_title,\r
+ '$count' => count($r),\r
+ '$id_header' => L10n::t('ID'),\r
+ '$param_header' => L10n::t('Job Parameters'),\r
+ '$created_header' => L10n::t('Created'),\r
+ '$prio_header' => L10n::t('Priority'),\r
+ '$info' => $info,\r
+ '$entries' => $r,\r
+ ]);\r
+ }\r
+}\r
'features' => ['admin/features' , L10n::t('Additional features') , 'features'],\r
'tos' => ['admin/tos' , L10n::t('Terms of Service') , 'tos'],\r
]],\r
+ 'database' => [L10n::t('Database'), [\r
+ 'deferred' => ['admin/queue/deferred', L10n::t('Inspect Deferred Workers'), 'deferred'],\r
+ 'workerqueue' => ['admin/queue' , L10n::t('Inspect worker Queue') , 'workerqueue'],\r
+ ]],\r
'tools' => [L10n::t('Tools'), [\r
'contactblock' => ['admin/blocklist/contact', L10n::t('Contact Blocklist') , 'contactblock'],\r
'blocklist' => ['admin/blocklist/server' , L10n::t('Server Blocklist') , 'blocklist'],\r
<table>
<tr>
<th>{{$id_header}}</th>
- <th>{{$to_header}}</th>
- <th>{{$url_header}}</th>
- <th>{{$network_header}}</th>
+ <th>{{$param_header}}</th>
<th>{{$created_header}}</th>
- <th>{{$last_header}}</th>
+ <th>{{$prio_header}}</th>
</tr>
{{foreach $entries as $e}}
<tr>
<td>{{$e.id}}</td>
- <td>{{$e.name}}</td>
- <td><a href="{{$e.nurl}}">{{$e.nurl}}</a></td>
- <td>{{$e.network}}</td>
+ <td>{{$e.parameter}}</td>
<td>{{$e.created}}</td>
- <td>{{$e.last}}</td>
+ <td>{{$e.priority}}</td>
</tr>
{{/foreach}}
</table>
<dl>
<dt>{{$queues.label}}</dt>
- <dd><a href="{{$baseurl}}/admin/deferred">{{$queues.deferred}}</a> - <a href="{{$baseurl}}/admin/workerqueue">{{$queues.workerq}}</a></dd>
+ <dd><a href="{{$baseurl}}/admin/queue/deferred">{{$queues.deferred}}</a> - <a href="{{$baseurl}}/admin/queue">{{$queues.workerq}}</a></dd>
</dl>
<dl>
<dt>{{$pending.0}}</dt>
+++ /dev/null
-<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>
<table class="table">
<tr>
<th>{{$id_header}}</th>
- <th>{{$to_header}}</th>
- <th>{{$url_header}}</th>
- <th>{{$network_header}}</th>
+ <th>{{$param_header}}</th>
<th>{{$created_header}}</th>
- <th>{{$last_header}}</th>
+ <th>{{$prio_header}}</th>
</tr>
{{foreach $entries as $e}}
<tr>
<td>{{$e.id}}</td>
- <td>{{$e.name}}</td>
- <td><a href="{{$e.nurl}}">{{$e.nurl}}</a></td>
- <td>{{$e.network}}</td>
+ <td>{{$e.parameter}}</td>
<td>{{$e.created}}</td>
- <td>{{$e.last}}</td>
+ <td>{{$e.priority}}</td>
</tr>
{{/foreach}}
</table>
{{* 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 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/deferred">{{$queues.deferred}}</a> - <a href="{{$baseurl}}/admin/workerqueue">{{$queues.workerq}}</a></div>
+ <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 admin-summary-entry"><a href="{{$baseurl}}/admin/queue/deferred">{{$queues.deferred}}</a> - <a href="{{$baseurl}}/admin/queue">{{$queues.workerq}}</a></div>
</div>
{{* Number of pending registrations. *}}
+++ /dev/null
-<div id="adminpage">
- <h1>{{$title}} - {{$page}} ({{$count}})</h1>
-
- <p>{{$info}}</p>
- <table class="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>
projects / friendica.git / commitdiff