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

more efficient public feed fetching

Browse Source
This commit is contained in:
friendica 2014-04-02 15:13:50 -07:00
parent 0a097b8337
commit 27fec9cb64
4 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boot.php
View File

@ -47,7 +47,7 @@ define ( 'RED_PLATFORM', 'Red Matrix' );
define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'R'); define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'R');
define ( 'ZOT_REVISION', 1 ); define ( 'ZOT_REVISION', 1 );
define ( 'DB_UPDATE_VERSION', 1105 ); define ( 'DB_UPDATE_VERSION', 1106 );
define ( 'EOL', '<br />' . "\r\n" ); define ( 'EOL', '<br />' . "\r\n" );
define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' );

23
include/externals.php
View File

@ -25,7 +25,7 @@ function externals_run($argv, $argc){
$url = $arr['url']; $url = $arr['url'];
} }
else { else {
$r = q("select site_url from site where site_url != '%s' and site_flags != %d order by rand() limit 1", $r = q("select site_url, site_pull from site where site_url != '%s' and site_flags != %d order by rand() limit 1",
dbesc(z_root()), dbesc(z_root()),
intval(DIRECTORY_MODE_STANDALONE) intval(DIRECTORY_MODE_STANDALONE)
); );
@ -36,16 +36,27 @@ function externals_run($argv, $argc){
$attempts ++; $attempts ++;
if($url) { if($url) {
$days = get_config('externals','since_days'); if($r[0]['site_pull'] !== '0000-00-00 00:00:00')
if($days === false) $mindate = urlencode($r[0]['site_pull']);
$days = 15; else {
$days = get_config('externals','since_days');
if($days === false)
$days = 15;
$mindate = urlencode(datetime_convert('','','now - ' . intval($days) . ' days'));
}
$feedurl = $url . '/zotfeed?f=&mindate=' . urlencode(datetime_convert('','','now - ' . intval($days) . ' days')); $feedurl = $url . '/zotfeed?f=&mindate=' . $mindate;
logger('externals: pulling public content from ' . $feedurl, LOGGER_DEBUG); logger('externals: pulling public content from ' . $feedurl, LOGGER_DEBUG);
$x = z_fetch_url($feedurl);
$x = z_fetch_url($feedurl);
if(($x) && ($x['success'])) { if(($x) && ($x['success'])) {
q("update site set site_pull = '%s' where site_url = '%s limit 1",
dbesc(datetime_convert()),
dbesc($url)
);
$j = json_decode($x['body'],true); $j = json_decode($x['body'],true);
if($j['success'] && $j['messages']) { if($j['success'] && $j['messages']) {
$sys = get_sys_channel(); $sys = get_sys_channel();

3
install/database.sql
View File

@ -866,7 +866,8 @@ CREATE TABLE IF NOT EXISTS `site` (
`site_access` int(11) NOT NULL DEFAULT '0', `site_access` int(11) NOT NULL DEFAULT '0',
`site_flags` int(11) NOT NULL DEFAULT '0', `site_flags` int(11) NOT NULL DEFAULT '0',
`site_update` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `site_update` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`site_sync` datetime NOT NULL, `site_pull` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`site_sync` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`site_directory` char(255) NOT NULL DEFAULT '', `site_directory` char(255) NOT NULL DEFAULT '',
`site_register` int(11) NOT NULL DEFAULT '0', `site_register` int(11) NOT NULL DEFAULT '0',
`site_sellpage` char(255) NOT NULL DEFAULT '', `site_sellpage` char(255) NOT NULL DEFAULT '',

11
install/update.php
View File

@ -1,6 +1,6 @@
<?php <?php
define( 'UPDATE_VERSION' , 1105 ); define( 'UPDATE_VERSION' , 1106 );
/** /**
* *
@ -1173,3 +1173,12 @@ function update_r1104() {
return UPDATE_SUCCESS; return UPDATE_SUCCESS;
return UPDATE_FAILED; return UPDATE_FAILED;
} }
function update_r1105() {
$r = q("ALTER TABLE `site` ADD `site_pull` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00' AFTER `site_update` ,
CHANGE `site_sync` `site_sync` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', ADD INDEX ( `site_pull` ) ");
if($r)
return UPDATE_SUCCESS;
return UPDATE_FAILED;
}