diff options
| -rw-r--r-- | include/onedirsync.php | 19 | ||||
| -rw-r--r-- | include/poller.php | 2 | ||||
| -rw-r--r-- | version.inc | 2 |
3 files changed, 21 insertions, 2 deletions
diff --git a/include/onedirsync.php b/include/onedirsync.php index c2ac3b59d..8ae1df5e5 100644 --- a/include/onedirsync.php +++ b/include/onedirsync.php @@ -31,6 +31,25 @@ function onedirsync_run($argv, $argc){ if(($r[0]['ud_flags'] & UPDATE_FLAGS_UPDATED) || (! $r[0]['ud_addr'])) return; + // Have we probed this channel more recently than the other directory server + // (where we received this update from) ? + // If we have, we don't need to do anything except mark any older entries updated + + $x = q("select * from updates where ud_addr = '%s' and ud_date > '%s' and ( ud_flags & %d ) order by ud_date desc limit 1", + dbesc($r[0]['ud_addr']), + dbesc($r[0]['ud_date']), + intval(UPDATE_FLAGS_UPDATED) + ); + if($x) { + $y = q("update updates set ud_flags = ( ud_flags | %d ) where ud_addr = '%s' and not ( ud_flags & %d ) 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]); return; diff --git a/include/poller.php b/include/poller.php index 48959fe61..94ca99e54 100644 --- a/include/poller.php +++ b/include/poller.php @@ -242,7 +242,7 @@ function poller_run($argv, $argc){ } if($dirmode == DIRECTORY_MODE_SECONDARY || $dirmode == DIRECTORY_MODE_PRIMARY) { - $r = q("select * from updates where not ( ud_flags & %d ) and ud_addr != '' and ( ud_last = '0000-00-00 00:00:00' OR ud_last > UTC_TIMESTAMP() - INTERVAL 7 DAY ) ", + $r = q("select distinct ud_addr, updates.* from updates where not ( ud_flags & %d ) and ud_addr != '' and ( ud_last = '0000-00-00 00:00:00' OR ud_last > UTC_TIMESTAMP() - INTERVAL 7 DAY ) group by ud_addr ", intval(UPDATE_FLAGS_UPDATED) ); if($r) { diff --git a/version.inc b/version.inc index 888fa6d36..cb921a3a7 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-10-14.466 +2013-10-15.467 |