Proxmox-Port/proxmox
1
0
Fork 0
forked from proxmox-mirrors/proxmox
Code Pull Requests Activity

RateLimiter: avoid panic in time computations

Browse Source
This commit is contained in:
Dietmar Maurer 2021-11-04 11:59:45 +01:00
parent e0305f724b
commit e0a9982dd1
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
proxmox-http/src/client/rate_limiter.rs
View File

@ -36,7 +36,7 @@ impl RateLimiter {
/// Returns the average rate (since `start_time`) /// Returns the average rate (since `start_time`)
pub fn average_rate(&self, current_time: Instant) -> f64 { pub fn average_rate(&self, current_time: Instant) -> f64 {
let time_diff = (current_time - self.start_time).as_secs_f64(); let time_diff = current_time.saturating_duration_since(self.start_time).as_secs_f64();
if time_diff <= 0.0 { if time_diff <= 0.0 {
0.0 0.0
} else { } else {
@ -45,12 +45,15 @@ impl RateLimiter {
} }
fn refill_bucket(&mut self, current_time: Instant) { fn refill_bucket(&mut self, current_time: Instant) {
let time_diff = (current_time - self.last_update).as_nanos(); let time_diff = match current_time.checked_duration_since(self.last_update) {
Some(duration) => duration.as_nanos(),
None => {
//log::error!("update_time: got negative time diff");
return;
}
};
if time_diff <= 0 { if time_diff == 0 { return; }
//log::error!("update_time: got negative time diff");
return;
}
self.last_update = current_time; self.last_update = current_time;