tornadocontrib/ web3-proxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix check for http providers 

even the websocket providers have an http_client set. maybe drop that?
This commit is contained in:
Bryan Stitt 2022-09-14 06:38:53 +00:00
parent 1730b8c7a5
commit ed505cdd23
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
web3_proxy/src/rpcs/connection.rs
View File

@ -269,7 +269,11 @@ impl Web3Connection {
cap_ms, cap_ms,
rand::thread_rng().gen_range(base_ms..(base_ms * range_multiplier)), rand::thread_rng().gen_range(base_ms..(base_ms * range_multiplier)),
); );
sleep(Duration::from_millis(first_sleep_ms)).await; let reconnect_in = Duration::from_millis(first_sleep_ms);
warn!(rpc=%self, ?reconnect_in, "Reconnect in");
sleep(reconnect_in).await;
first_sleep_ms first_sleep_ms
} else { } else {
@ -301,19 +305,22 @@ impl Web3Connection {
) -> anyhow::Result<()> { ) -> anyhow::Result<()> {
// since this lock is held open over an await, we use tokio's locking // since this lock is held open over an await, we use tokio's locking
// TODO: timeout on this lock. if its slow, something is wrong // TODO: timeout on this lock. if its slow, something is wrong
let mut provider = self.provider.write().await; let mut provider_option = self.provider.write().await;
if provider.is_some() { if let Some(provider) = &*provider_option {
if self.http_client.is_some() { match provider.as_ref() {
// http clients don't need to do anything for reconnecting Web3Provider::Http(_) => {
// they *do* need to run this function to setup the first // http clients don't need to do anything for reconnecting
return Ok(()); // they *do* need to run this function to setup the first
return Ok(());
}
Web3Provider::Ws(_) => {}
} }
info!(rpc=%self, "reconnecting"); info!(rpc=%self, "reconnecting");
// disconnect the current provider // disconnect the current provider
*provider = None; *provider_option = None;
// reset sync status // reset sync status
{ {
@ -335,7 +342,7 @@ impl Web3Connection {
// TODO: if this fails, keep retrying! otherwise it crashes and doesn't try again! // TODO: if this fails, keep retrying! otherwise it crashes and doesn't try again!
let new_provider = Web3Provider::from_str(&self.url, self.http_client.clone()).await?; let new_provider = Web3Provider::from_str(&self.url, self.http_client.clone()).await?;
*provider = Some(Arc::new(new_provider)); *provider_option = Some(Arc::new(new_provider));
info!(rpc=%self, "successfully connected"); info!(rpc=%self, "successfully connected");