fix(oauth): strengthen sync guarantees
Release Build / Rust project - latest (aarch64-unknown-linux-musl) (push) Waiting to run
Release Build / Rust project - latest (armv7-unknown-linux-musleabihf) (push) Waiting to run
Release Build / Rust project - latest (x86_64-unknown-linux-musl) (push) Waiting to run
Rust Build & Publish / build (push) Waiting to run
Pull Request / cargo test (push) Waiting to run
Pull Request / cargo fmt --all -- --check (push) Waiting to run
Pull Request / cargo clippy -- -D warnings (push) Waiting to run

This commit is contained in:
Matthew Esposito
2024-06-26 23:41:26 -04:00
parent 8c5aaaa33d
commit 3bd8b511a7
2 changed files with 5 additions and 5 deletions
+4 -4
View File
@@ -11,7 +11,7 @@ use percent_encoding::{percent_encode, CONTROLS};
use serde_json::Value;
use std::sync::atomic::Ordering;
use std::sync::atomic::{AtomicU16, Ordering::Relaxed};
use std::sync::atomic::{AtomicU16, Ordering::SeqCst};
use std::{io, result::Result};
use tokio::sync::RwLock;
@@ -317,10 +317,10 @@ pub async fn json(path: String, quarantine: bool) -> Result<Value, String> {
};
// First, handle rolling over the OAUTH_CLIENT if need be.
let current_rate_limit = OAUTH_RATELIMIT_REMAINING.load(Ordering::Relaxed);
let current_rate_limit = OAUTH_RATELIMIT_REMAINING.load(Ordering::SeqCst);
if current_rate_limit < 10 {
warn!("Rate limit {current_rate_limit} is low. Spawning force_refresh_token()");
OAUTH_RATELIMIT_REMAINING.store(99, Ordering::Relaxed);
OAUTH_RATELIMIT_REMAINING.store(99, Ordering::SeqCst);
tokio::spawn(force_refresh_token());
}
@@ -333,7 +333,7 @@ pub async fn json(path: String, quarantine: bool) -> Result<Value, String> {
if let Some(Ok(remaining)) = response.headers().get("x-ratelimit-remaining").map(|val| val.to_str()) {
trace!("Ratelimit remaining: {}", remaining);
if let Ok(remaining) = remaining.parse::<f32>().map(|f| f.round() as u16) {
OAUTH_RATELIMIT_REMAINING.store(remaining, Relaxed);
OAUTH_RATELIMIT_REMAINING.store(remaining, SeqCst);
} else {
warn!("Failed to parse rate limit {remaining} from header.");
}
+1 -1
View File
@@ -131,7 +131,7 @@ pub async fn token_daemon() {
}
pub async fn force_refresh_token() {
trace!("Rolling over refresh token. Current rate limit: {}", OAUTH_RATELIMIT_REMAINING.load(Ordering::Relaxed));
trace!("Rolling over refresh token. Current rate limit: {}", OAUTH_RATELIMIT_REMAINING.load(Ordering::SeqCst));
OAUTH_CLIENT.write().await.refresh().await;
}