talexander/github_watcher
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Fallback to the previous poll interval duration if no poll interval is specified.

Browse Source
This commit is contained in:
Tom Alexander 2022-05-08 18:10:41 -04:00
parent df00268d35
commit f36546a470
Signed by: talexander
GPG Key ID: D3A179C9A53C0EDE
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/githubctl/github_endpoint_watcher.rs
View File

@ -12,6 +12,7 @@ pub struct GithubEndpointWatcher {
next_poll_allowed: u64, next_poll_allowed: u64,
ratelimit_remaining: Option<u64>, ratelimit_remaining: Option<u64>,
ratelimit_reset: Option<u64>, ratelimit_reset: Option<u64>,
previous_poll_interval: Option<u64>,
} }
impl GithubEndpointWatcher { impl GithubEndpointWatcher {
@ -31,6 +32,7 @@ impl GithubEndpointWatcher {
next_poll_allowed: 0, next_poll_allowed: 0,
ratelimit_remaining: None, ratelimit_remaining: None,
ratelimit_reset: None, ratelimit_reset: None,
previous_poll_interval: None,
}) })
} }
@ -65,6 +67,9 @@ impl GithubEndpointWatcher {
let headers = response.headers(); let headers = response.headers();
let etag = headers.get(reqwest::header::ETAG).map(|x| x.to_owned()); let etag = headers.get(reqwest::header::ETAG).map(|x| x.to_owned());
let poll_interval = number_header(headers.get("x-poll-interval"))?; let poll_interval = number_header(headers.get("x-poll-interval"))?;
if let Some(interval) = poll_interval {
self.previous_poll_interval = Some(interval);
}
// let ratelimit_limit = headers.get("x-ratelimit-limit").map(|x| x.to_owned()); // let ratelimit_limit = headers.get("x-ratelimit-limit").map(|x| x.to_owned());
self.ratelimit_remaining = number_header(headers.get("x-ratelimit-remaining"))?; self.ratelimit_remaining = number_header(headers.get("x-ratelimit-remaining"))?;
self.ratelimit_reset = number_header(headers.get("x-ratelimit-reset"))?; self.ratelimit_reset = number_header(headers.get("x-ratelimit-reset"))?;
@ -78,18 +83,27 @@ impl GithubEndpointWatcher {
self.etag = etag; self.etag = etag;
self.last_modified_at = last_modified_at; self.last_modified_at = last_modified_at;
let poll_interval_parsed: u64 = poll_interval.unwrap_or_else(|| { let poll_interval_parsed: u64 = poll_interval.unwrap_or_else(|| {
info!("No poll interval returned, defaulting to 5 minute polling."); let fallback_interval = self.previous_poll_interval.unwrap_or(300);
300 info!(
"No poll interval returned, defaulting to {} second polling.",
fallback_interval
);
fallback_interval
}); });
self.next_poll_allowed = request_started_at + poll_interval_parsed; self.next_poll_allowed = request_started_at + poll_interval_parsed;
return Ok(None); return Ok(None);
} else { } else {
let body = response.json::<serde_json::Value>().await?; let body = response.json::<serde_json::Value>().await?;
self.etag = etag; self.etag = etag;
self.last_modified_at = last_modified_at; self.last_modified_at = last_modified_at;
let poll_interval_parsed: u64 = poll_interval.unwrap_or_else(|| { let poll_interval_parsed: u64 = poll_interval.unwrap_or_else(|| {
info!("No poll interval returned, defaulting to 5 minute polling."); let fallback_interval = self.previous_poll_interval.unwrap_or(300);
300 info!(
"No poll interval returned, defaulting to {} second polling.",
fallback_interval
);
fallback_interval
}); });
self.next_poll_allowed = request_started_at + poll_interval_parsed; self.next_poll_allowed = request_started_at + poll_interval_parsed;