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

directory: don't try and sync a directory update that points to a hubloc we already know is dead and buried.

Browse Source
This commit is contained in:
friendica 2014-11-20 18:29:28 -08:00
parent e74a3926fe
commit 695abdcbd0
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
include/onedirsync.php
View File

@ -41,7 +41,7 @@ function onedirsync_run($argv, $argc){
intval(UPDATE_FLAGS_UPDATED) intval(UPDATE_FLAGS_UPDATED)
); );
if($x) { if($x) {
$y = q("update updates set ud_flags = ( ud_flags | %d ) where ud_addr = '%s' and not ( ud_flags & %d )>0 and ud_date < '%s' ", $y = q("update updates set ud_flags = ( ud_flags | %d ) where ud_addr = '%s' and ( ud_flags & %d ) = 0 and ud_date < '%s' ",
intval(UPDATE_FLAGS_UPDATED), intval(UPDATE_FLAGS_UPDATED),
dbesc($r[0]['ud_addr']), dbesc($r[0]['ud_addr']),
intval(UPDATE_FLAGS_UPDATED), intval(UPDATE_FLAGS_UPDATED),
@ -50,6 +50,23 @@ function onedirsync_run($argv, $argc){
return; return;
} }
// ignore doing an update if this ud_addr refers to a known dead hubloc
$h = q("select * from hubloc where hubloc_addr = '%s' limit 1",
dbesc($r[0]['ud_addr'])
);
if($h && $h[0]['hubloc_status'] & HUBLOC_OFFLINE) {
$y = q("update updates set ud_flags = ( ud_flags | %d ) where ud_addr = '%s' and ( ud_flags & %d ) = 0 and ud_date < '%s' ",
intval(UPDATE_FLAGS_UPDATED),
dbesc($r[0]['ud_addr']),
intval(UPDATE_FLAGS_UPDATED),
dbesc($x[0]['ud_date'])
);
return;
}
update_directory_entry($r[0]); update_directory_entry($r[0]);
return; return;