Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-07 17:06:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Imap: remove RwLock from ratelimit

Browse Source
This commit is contained in:
iequidoo
2024-04-12 02:50:13 -03:00
committed by iequidoo
parent aff6bf9402
commit ae10ed5c40
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/imap.rs
View File

@@ -20,7 +20,6 @@ use futures::{FutureExt as _, StreamExt, TryStreamExt};
use futures_lite::FutureExt; use futures_lite::FutureExt;
use num_traits::FromPrimitive; use num_traits::FromPrimitive;
use ratelimit::Ratelimit; use ratelimit::Ratelimit;
use tokio::sync::RwLock;
use crate::chat::{self, ChatId, ChatIdBlocked}; use crate::chat::{self, ChatId, ChatIdBlocked};
use crate::chatlist_events; use crate::chatlist_events;
@@ -90,7 +89,7 @@ pub(crate) struct Imap {
/// e.g. the server returning invalid response to SELECT command /// e.g. the server returning invalid response to SELECT command
/// immediately after logging in or returning an error in response to LOGIN command /// immediately after logging in or returning an error in response to LOGIN command
/// due to internal server error. /// due to internal server error.
ratelimit: RwLock<Ratelimit>, ratelimit: Ratelimit,
} }
#[derive(Debug)] #[derive(Debug)]
@@ -249,7 +248,7 @@ impl Imap {
login_failed_once: false, login_failed_once: false,
connectivity: Default::default(), connectivity: Default::default(),
// 1 connection per minute + a burst of 2. // 1 connection per minute + a burst of 2.
ratelimit: RwLock::new(Ratelimit::new(Duration::new(120, 0), 2.0)), ratelimit: Ratelimit::new(Duration::new(120, 0), 2.0),
}; };
Ok(imap) Ok(imap)
@@ -293,7 +292,7 @@ impl Imap {
bail!("IMAP operation attempted while it is torn down"); bail!("IMAP operation attempted while it is torn down");
} }
let ratelimit_duration = self.ratelimit.read().await.until_can_send(); let ratelimit_duration = self.ratelimit.until_can_send();
if !ratelimit_duration.is_zero() { if !ratelimit_duration.is_zero() {
warn!( warn!(
context, context,
@@ -316,7 +315,7 @@ impl Imap {
info!(context, "Connecting to IMAP server"); info!(context, "Connecting to IMAP server");
self.connectivity.set_connecting(context).await; self.connectivity.set_connecting(context).await;
self.ratelimit.write().await.send(); self.ratelimit.send();
let connection_res: Result<Client> = let connection_res: Result<Client> =
if self.lp.security == Socket::Starttls || self.lp.security == Socket::Plain { if self.lp.security == Socket::Starttls || self.lp.security == Socket::Plain {
let imap_server: &str = self.lp.server.as_ref(); let imap_server: &str = self.lp.server.as_ref();