friendica/dir
6
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Add ping stats during probe

Browse source
This commit is contained in:
Hypolite Petovan 2018-05-04 08:22:01 -04:00
parent 27153fab68
commit 95ea839fa7
1 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
include/site-health.php
View file

@ -110,6 +110,16 @@ if (!function_exists('run_site_probe')) {
$base_url = $entry['base_url']; $base_url = $entry['base_url'];
$probe_location = $base_url . '/friendica/json'; $probe_location = $base_url . '/friendica/json';
$net_ping = Net_Ping::factory();
$net_ping->setArgs(['count' => 5]);
$result = $net_ping->ping(parse_url($base_url, PHP_URL_HOST));
if (is_a($result, 'Net_Ping_Result')) {
$avg_ping = $result->getAvg();
} else {
$avg_ping = null;
}
//Prepare the CURL call. //Prepare the CURL call.
$handle = curl_init(); $handle = curl_init();
$options = array( $options = array(
@ -172,6 +182,12 @@ if (!function_exists('run_site_probe')) {
//Done with CURL now. //Done with CURL now.
curl_close($handle); curl_close($handle);
if ($time && $avg_ping) {
$speed_score = max(1, $avg_ping > 10 ? $time / $avg_ping : $time / 50);
} else {
$speed_score = null;
}
#TODO: if the site redirects elsewhere, notice this site and record an issue. #TODO: if the site redirects elsewhere, notice this site and record an issue.
$effective_base_url = parse_site_from_url($info['url']); $effective_base_url = parse_site_from_url($info['url']);
$wrong_base_url = $effective_base_url !== $entry['base_url']; $wrong_base_url = $effective_base_url !== $entry['base_url'];
@ -202,10 +218,12 @@ if (!function_exists('run_site_probe')) {
//Record the probe speed in a probes table. //Record the probe speed in a probes table.
q( q(
"INSERT INTO `site-probe` (`site_health_id`, `dt_performed`, `request_time`)" . "INSERT INTO `site-probe` (`site_health_id`, `dt_performed`, `request_time`, `avg_ping`, `speed_score`)" .
"VALUES (%u, NOW(), %u)", "VALUES (%u, NOW(), %u, %u, %u)",
$entry['id'], $entry['id'],
$time $time,
$avg_ping,
$speed_score
); );
if (isset($data->addons)) { if (isset($data->addons)) {
@ -322,7 +340,7 @@ if (!function_exists('health_score_after_probe')) {
} }
//Older than 3.3.x? //Older than 3.3.x?
elseif (intval($versionParts[1] < 3)) { elseif (!empty($versionParts[1]) && intval($versionParts[1] < 3)) {
$current -= 5; //Somewhat outdated. $current -= 5; //Somewhat outdated.
} }