mexon/friendica
1
0
Fork 0
Code Pull requests Activity

Merge pull request #1887 from annando/issue-1886

Browse source 
Issue 1886: Some speedup for poco
This commit is contained in:
Tobias Diekershoff 2015-09-11 20:58:41 +02:00
parent 6b744aa71c 91d5c31656
commit 89c38cccd1
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
include/socgraph.php
View file

@ -234,7 +234,7 @@ function poco_check($profile_url, $name, $network, $profile_photo, $about, $loca
} }
if ((($network == "") OR ($name == "") OR ($profile_photo == "") OR ($server_url == "") OR $alternate) if ((($network == "") OR ($name == "") OR ($profile_photo == "") OR ($server_url == "") OR $alternate)
AND poco_reachable($profile_url, $server_url, $network, true)) { AND poco_reachable($profile_url, $server_url, $network, false)) {
$data = probe_url($profile_url); $data = probe_url($profile_url);
$orig_profile = $profile_url; $orig_profile = $profile_url;
@ -1296,8 +1296,11 @@ function poco_discover($complete = false) {
if ($r) if ($r)
foreach ($r AS $server) { foreach ($r AS $server) {
if (!poco_check_server($server["url"], $server["network"])) if (!poco_check_server($server["url"], $server["network"])) {
// The server is not reachable? Okay, then we will try it later
q("UPDATE `gserver` SET `last_poco_query` = '%s' WHERE `nurl` = '%s'", dbesc(datetime_convert()), dbesc($server["nurl"]));
continue; continue;
}
// Fetch all users from the other server // Fetch all users from the other server
$url = $server["poco"]."/?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,generation"; $url = $server["poco"]."/?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,generation";
@ -1338,8 +1341,13 @@ function poco_discover($complete = false) {
q("UPDATE `gserver` SET `last_poco_query` = '%s' WHERE `nurl` = '%s'", dbesc(datetime_convert()), dbesc($server["nurl"])); q("UPDATE `gserver` SET `last_poco_query` = '%s' WHERE `nurl` = '%s'", dbesc(datetime_convert()), dbesc($server["nurl"]));
if (!$complete AND (--$no_of_queries == 0)) if (!$complete AND (--$no_of_queries == 0))
break; break;
} else // If the server hadn't replied correctly, then force a sanity check } else {
// If the server hadn't replied correctly, then force a sanity check
poco_check_server($server["url"], $server["network"], true); poco_check_server($server["url"], $server["network"], true);
// If we couldn't reach the server, we will try it some time later
q("UPDATE `gserver` SET `last_poco_query` = '%s' WHERE `nurl` = '%s'", dbesc(datetime_convert()), dbesc($server["nurl"]));
}
} }
} }