More logging for the poller. Changed the query for the contacts to reduce the amount of contacts
This commit is contained in:
parent
1a52a238a0
commit
4c901e60cc
1 changed files with 26 additions and 24 deletions
|
@ -201,17 +201,18 @@ function poller_run(&$argv, &$argc){
|
||||||
);
|
);
|
||||||
|
|
||||||
$contacts = q("SELECT `contact`.`id` FROM `contact` INNER JOIN `user` ON `user`.`uid` = `contact`.`uid`
|
$contacts = q("SELECT `contact`.`id` FROM `contact` INNER JOIN `user` ON `user`.`uid` = `contact`.`uid`
|
||||||
WHERE ( `rel` = %d OR `rel` = %d ) AND `poll` != ''
|
WHERE `rel` IN (%d, %d) AND `poll` != '' AND `network` IN ('%s', '%s', '%s', '%s', '%s', '%s')
|
||||||
AND NOT `network` IN ( '%s', '%s', '%s' )
|
|
||||||
$sql_extra
|
$sql_extra
|
||||||
AND `self` = 0 AND `contact`.`blocked` = 0 AND `contact`.`readonly` = 0
|
AND NOT `self` AND NOT `contact`.`blocked` AND NOT `contact`.`readonly` AND NOT `contact`.`archive`
|
||||||
AND `contact`.`archive` = 0
|
AND NOT `user`.`account_expired` AND NOT `user`.`account_removed` $abandon_sql ORDER BY RAND()",
|
||||||
AND `user`.`account_expired` = 0 AND `user`.`account_removed` = 0 $abandon_sql ORDER BY RAND()",
|
|
||||||
intval(CONTACT_IS_SHARING),
|
intval(CONTACT_IS_SHARING),
|
||||||
intval(CONTACT_IS_FRIEND),
|
intval(CONTACT_IS_FRIEND),
|
||||||
dbesc(NETWORK_DIASPORA),
|
dbesc(NETWORK_DFRN),
|
||||||
dbesc(NETWORK_FACEBOOK),
|
dbesc(NETWORK_ZOT),
|
||||||
dbesc(NETWORK_PUMPIO)
|
dbesc(NETWORK_OSTATUS),
|
||||||
|
dbesc(NETWORK_FEED),
|
||||||
|
dbesc(NETWORK_MAIL),
|
||||||
|
dbesc(NETWORK_MAIL2)
|
||||||
);
|
);
|
||||||
|
|
||||||
if(! count($contacts)) {
|
if(! count($contacts)) {
|
||||||
|
@ -229,6 +230,8 @@ function poller_run(&$argv, &$argc){
|
||||||
|
|
||||||
foreach($res as $contact) {
|
foreach($res as $contact) {
|
||||||
|
|
||||||
|
logger("Check for polling ".$contact["uid"]." ".$contact["id"]." ".$contact["network"]." ".$contact["nick"]);
|
||||||
|
|
||||||
$xml = false;
|
$xml = false;
|
||||||
|
|
||||||
if($manual_id)
|
if($manual_id)
|
||||||
|
@ -291,15 +294,12 @@ function poller_run(&$argv, &$argc){
|
||||||
$update = true;
|
$update = true;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
if((! $update) && (! $force))
|
if((!$update) && (!$force))
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Don't run onepoll.php if the contact isn't pollable
|
logger("Polling ".$contact["uid"]." ".$contact["id"]." ".$contact["network"]." ".$contact["nick"]);
|
||||||
// This check also is inside the onepoll.php - but this will reduce the load
|
|
||||||
if (in_array($contact["rel"], array(CONTACT_IS_SHARING, CONTACT_IS_FRIEND)) AND ($contact["poll"] != "")
|
|
||||||
AND !in_array($contact['network'], array(NETWORK_DIASPORA, NETWORK_FACEBOOK, NETWORK_PUMPIO, NETWORK_TWITTER, NETWORK_APPNET))
|
|
||||||
AND !$contact["self"] AND !$contact["blocked"] AND !$contact["readonly"] AND !$contact["archive"])
|
|
||||||
proc_run('php','include/onepoll.php',$contact['id']);
|
proc_run('php','include/onepoll.php',$contact['id']);
|
||||||
|
|
||||||
if($interval)
|
if($interval)
|
||||||
|
@ -307,6 +307,8 @@ function poller_run(&$argv, &$argc){
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
logger('poller: end');
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue