harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

queue management actions. Still needs further work such as indication of last successful connection or indication that the hub was marked offline, but these are potentially expensive queries.

Browse Source
This commit is contained in:
friendica 2015-03-01 15:55:27 -08:00
parent ced19bf7d8
commit ba7bdd79b7
5 changed files with 49 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/hubloc.php
View File

@ -175,8 +175,9 @@ function hubloc_change_primary($hubloc) {
// The https might be alive, and the http dead.
function hubloc_mark_as_down($posturl) {
$r = q("update hubloc set hubloc_status = ( hubloc_status | %d ) where hubloc_posturl = '%s'",
intval(HUBLOC_OFFLINE)
$r = q("update hubloc set hubloc_status = ( hubloc_status | %d ) where hubloc_callback = '%s'",
intval(HUBLOC_OFFLINE),
dbesc($posturl)
);
}

39
mod/admin.php
View File

@ -590,19 +590,42 @@ function admin_page_dbsync(&$a) {
function admin_page_queue($a) {
$o = '';
$r = q("select count(outq_posturl) as total, outq_posturl, max(hubloc_connected) as connected from outq
where outq_delivered = 0 group by outq_posturl order by total desc");
if($_REQUEST['drophub']) {
require_once('hubloc.php');
hubloc_mark_as_down($_REQUEST['drophub']);
}
if($_REQUEST['emptyhub']) {
$r = q("delete from outq where outq_posturl = '%s' ",
dbesc($_REQUEST['emptyhub'])
);
}
$r = q("select count(outq_posturl) as total, outq_posturl from outq
where outq_delivered = 0 group by outq_posturl order by total desc");
$o .= '<h3>' . t('Queue Statistics') . '</h3>';
if($r) {
$o .= '<table><tr><td>' . t('Total Entries') . '&nbsp;&nbsp;</td><td>' . t('Destination URL') . '</td></tr>';
foreach($r as $rr) {
$o .= '<tr><td>' . $rr['total'] . '</td><td>' . $rr['outq_posturl'] . '</td></tr>';
}
$o .= '</table>';
for($x = 0; $x < count($r); $x ++) {
$r[$x]['eurl'] = urlencode($r[$x]['outq_posturl']);
$r[$x]['connected'] = datetime_convert('UTC',date_default_timezone_get(),$r[$x]['connected'],'Y-m-d');
}
$o = replace_macros(get_markup_template('admin_queue.tpl'), array(
'$banner' => t('Queue Statistics'),
'$numentries' => t('Total Entries'),
'$desturl' => t('Destination URL'),
'$nukehub' => t('Mark hub permanently offline'),
'$empty' => t('Empty queue for this hub'),
'$lastconn' => t('Last known contact'),
'$hasentries' => ((count($r)) ? true : false),
'$entries' => $r
));
return $o;
}

2
version.inc
View File

@ -1 +1 @@
2015-02-27.956
2015-03-01.958

1
view/en/htconfig.tpl
View File

@ -71,7 +71,6 @@ $a->config['system']['access_policy'] = ACCESS_PRIVATE;
$a->config['system']['sellpage'] = '';
// Maximum size of an imported message, 0 is unlimited
// FIXME - NOT currently implemented.
$a->config['system']['max_import_size'] = 200000;

14
view/tpl/admin_queue.tpl Normal file
View File

@ -0,0 +1,14 @@
<h3>{{$banner}}</h3>
{{if $hasentries}}
<table id="admin-queue-table"><tr><td>{{$numentries}}&nbsp;&nbsp;</td><td>{{$desturl}}</td><td>&nbsp;</td><td>&nbsp;</td></tr>
{{foreach $entries as $e}}
<tr><td>{{$e.total}}</td><td>{{$e.outq_posturl}}</td><td><a href="admin/queue?f=&drophub={{$e.eurl}}" title="{{$nukehub}}" class="btn btn-default"><i class="icon-remove"></i><a></td><td><a href="admin/queue?f=&emptyhub={{$e.eurl}}" title="{{$empty}}" class="btn btn-default"><i class="icon-trash"></i></a></td></tr>
{{/foreach}}
</table>
{{/if}}