nupplaPhil/friendica-directory
1
0
Fork 0
forked from friendica/friendica-directory
Code Issues Pull requests Releases Wiki Activity

Merge pull request #63 from MrPetovan/task/54-no-ping-penalty

Browse source 
Factor in the unavailability of ping in the health score
This commit is contained in:
Tobias Diekershoff 2020-09-27 17:56:49 +02:00 committed by GitHub
commit 520ddf5a8c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/classes/Pollers/Server.php
View file

@ -90,6 +90,8 @@ class Server
$parse_success = !empty($probe_result['data']['url']); $parse_success = !empty($probe_result['data']['url']);
$avg_ping = null;
if ($parse_success) { if ($parse_success) {
$base_url = $probe_result['data']['url']; $base_url = $probe_result['data']['url'];
@ -184,12 +186,21 @@ class Server
} }
$this->discoverPoco($base_url); $this->discoverPoco($base_url);
} else {
$this->logger->debug('Parse unsuccessful', ['$polled_url' => $polled_url, '$probe_result' => $probe_result]);
} }
if ($server) { if ($server) {
//Get the new health. //Get the new health.
$version = $parse_success ? $probe_result['data']['version'] : ''; $version = $parse_success ? $probe_result['data']['version'] : '';
$health_score = $this->computeHealthScore($server['health_score'], $parse_success, $probe_result['time'], $version, $probe_result['ssl_state']); $health_score = $this->computeHealthScore(
$server['health_score'],
$parse_success,
$probe_result['time'],
$version,
$probe_result['ssl_state'],
$avg_ping
);
$this->atlas->perform( $this->atlas->perform(
'UPDATE `server` SET `health_score` = :health_score WHERE `id` = :server_id', 'UPDATE `server` SET `health_score` = :health_score WHERE `id` = :server_id',
@ -307,7 +318,14 @@ class Server
return ['data' => $data, 'time' => $time, 'curl_info' => $curl_info, 'ssl_state' => $ssl_state]; return ['data' => $data, 'time' => $time, 'curl_info' => $curl_info, 'ssl_state' => $ssl_state];
} }
private function computeHealthScore(int $original_health, bool $probe_success, int $time = null, string $version = null, int $ssl_state = null): int private function computeHealthScore(
int $original_health,
bool $probe_success,
?int $time,
?string $version,
?int $ssl_state,
?float $avg_ping
): int
{ {
//Probe failed, costs you 30 points. //Probe failed, costs you 30 points.
if (!$probe_success) { if (!$probe_success) {
@ -378,6 +396,11 @@ class Server
} }
} }
// No ping penalty
if (!$avg_ping) {
$max_health -= 5;
}
return max(min($max_health, $original_health + $delta), -100); return max(min($max_health, $original_health + $delta), -100);
} }