blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

bigtable: add timeout to token refresh (#28728) 

Co-authored-by: Kirill Fomichev <fanatid@ya.ru>
This commit is contained in:
Brandon Roberts 2022-11-14 17:39:26 -06:00 committed by GitHub
parent d4cf18421d
commit 55985701ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
storage-bigtable/src/access_token.rs
View File

@ -16,6 +16,7 @@ use {
}, },
time::Instant, time::Instant,
}, },
tokio::time,
}; };
fn load_credentials(filepath: Option<String>) -> Result<Credentials, String> { fn load_credentials(filepath: Option<String>) -> Result<Credentials, String> {
@ -109,15 +110,22 @@ impl AccessToken {
} }
info!("Refreshing token"); info!("Refreshing token");
let new_token = Self::get_token(&self.credentials, &self.scope).await; match time::timeout(
time::Duration::from_secs(5),
Self::get_token(&self.credentials, &self.scope),
)
.await
{ {
let mut token_w = self.token.write().unwrap(); Ok(new_token) => match (new_token, self.token.write()) {
match new_token { (Ok(new_token), Ok(mut token_w)) => *token_w = new_token,
Ok(new_token) => *token_w = new_token, (Ok(_new_token), Err(err)) => warn!("{}", err),
Err(err) => warn!("{}", err), (Err(err), _) => warn!("{}", err),
},
Err(_) => {
warn!("Token refresh timeout")
} }
self.refresh_active.store(false, Ordering::Relaxed);
} }
self.refresh_active.store(false, Ordering::Relaxed);
} }
/// Return an access token suitable for use in an HTTP authorization header /// Return an access token suitable for use in an HTTP authorization header