Correctly bounding nominator of uptime calculation (#752)

This commit is contained in:
Jędrzej Stuczyński
2021-08-26 11:21:01 +01:00
committed by GitHub
parent c6b286a1db
commit 6bdfe7f895
+5 -5
View File
@@ -6,7 +6,7 @@ use crate::node_status_api::{FIFTEEN_MINUTES, ONE_HOUR};
use crate::storage::models::NodeStatus;
use log::warn;
use sqlx::types::time::OffsetDateTime;
use std::cmp::max;
use std::cmp::min;
// A temporary helper struct used to produce reports for active nodes.
pub(crate) struct ActiveNodeDayStatuses {
@@ -77,8 +77,8 @@ impl NodeUptimes {
ipv6_hour_up,
last_hour_test_runs,
);
ipv4_hour_up = max(ipv4_hour_up, last_hour_test_runs);
ipv6_hour_up = max(ipv6_hour_up, last_hour_test_runs);
ipv4_hour_up = min(ipv4_hour_up, last_hour_test_runs);
ipv6_hour_up = min(ipv6_hour_up, last_hour_test_runs);
}
if ipv4_day_up > last_day_test_runs || ipv6_day_up > last_day_test_runs {
@@ -88,8 +88,8 @@ impl NodeUptimes {
ipv6_day_up,
last_day_test_runs,
);
ipv4_day_up = max(ipv4_day_up, last_day_test_runs);
ipv6_day_up = max(ipv6_day_up, last_day_test_runs);
ipv4_day_up = min(ipv4_day_up, last_day_test_runs);
ipv6_day_up = min(ipv6_day_up, last_day_test_runs);
}
// the unwraps in Uptime::from_ratio are fine because it's impossible for us to have more "up" results