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

for directory sync, ensure we have a fallback master; even if we have nothing else

Browse Source
This commit is contained in:
friendica 2013-04-18 20:47:35 -07:00
parent 2679a5990e
commit 0fbb3b6a97
2 changed files with 54 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
include/dir_fns.php
View File

@ -6,6 +6,49 @@ function find_upstream_directory($dirmode) {
return ''; return '';
} }
function sync_directories($dirmode) {
if($dirmode == DIRECTORY_MODE_STANDALONE || $dirmode == DIRECTORY_MODE_NORMAL)
return;
$r = q("select * from site where (site_flags & %d) and site_url != '%s'",
intval(DIRECTORY_MODE_PRIMARY),
dbesc(z_root())
);
// If there are no directory servers, setup the fallback master
if((! $r) && (z_root() != DIRECTORY_FALLBACK_MASTER)) {
$r = array(
'site_url' => DIRECTORY_FALLBACK_MASTER,
'site_flags' => DIRECTORY_MODE_PRIMARY,
'site_update' => '0000-00-00 00:00:00',
'site_directory' => DIRECTORY_FALLBACK_MASTER . '/dirsearch'
);
$x = q("insert into site ( site_url, site_flags, site_update, site_directory )
values ( '%s', %d', '%s', '%s' ) ",
dbesc($r[0]['site_url']),
intval($r[0]['site_flags']),
dbesc($r[0]['site_update']),
dbesc($r[0]['site_directory'])
);
}
}
function syncdirs($uid) { function syncdirs($uid) {
logger('syncdirs', LOGGER_DEBUG); logger('syncdirs', LOGGER_DEBUG);

15
include/poller.php
View File

@ -50,16 +50,23 @@ function poller_run($argv, $argc){
if($d2 != intval($d1)) { if($d2 != intval($d1)) {
// If this is a directory server, request a sync with an upstream
// directory at least once a day, up to once every poll interval.
// Pull remote changes and push local changes.
// potential issue: how do we keep from creating an endless update loop?
$dirmode = get_config('system','directory_mode');
if($dirmode == DIRECTORY_MODE_SECONDARY || $dirmode == DIRECTORY_MODE_PRIMARY) {
require_once('include/dir_fns.php');
sync_directories($dirmode);
}
// update_suggestions(); // update_suggestions();
set_config('system','last_expire_day',$d2); set_config('system','last_expire_day',$d2);
proc_run('php','include/expire.php'); proc_run('php','include/expire.php');
} }
// If this is a directory server, request a sync with an upstream
// directory at least once a day, up to once every poll interval.
// Pull remote changes and push local changes.
// potential issue: how do we keep from creating an endless update loop?
$manual_id = 0; $manual_id = 0;
$generation = 0; $generation = 0;