Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-04-21 07:26:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix various integration tests with the python bindings

Browse Source
This commit is contained in:
dignifiedquire
2020-03-22 16:21:15 +01:00
parent 9b4c195872
commit 20ef115eb2
8 changed files with 86 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/scheduler.rs
View File

@@ -48,6 +48,8 @@ impl Context {
}
async fn inbox_loop(ctx: Context, inbox_handlers: ImapConnectionHandlers) {
use futures::future::FutureExt;
info!(ctx, "starting inbox loop");
let ImapConnectionHandlers {
mut connection,
@@ -56,7 +58,10 @@ async fn inbox_loop(ctx: Context, inbox_handlers: ImapConnectionHandlers) {
} = inbox_handlers;
let fut = async move {
connection.connect_configured(&ctx).await.unwrap();
if let Err(err) = connection.connect_configured(&ctx).await {
error!(ctx, "{}", err);
return;
}
loop {
let probe_network = ctx.scheduler.read().await.get_probe_network();
@@ -101,7 +106,7 @@ async fn inbox_loop(ctx: Context, inbox_handlers: ImapConnectionHandlers) {
}
};
fut.race(stop_receiver.recv()).await;
fut.race(stop_receiver.recv().map(|_| ())).await;
shutdown_sender.send(()).await;
}
@@ -110,6 +115,8 @@ async fn simple_imap_loop(
inbox_handlers: ImapConnectionHandlers,
folder: impl AsRef<str>,
) {
use futures::future::FutureExt;
info!(ctx, "starting simple loop for {}", folder.as_ref());
let ImapConnectionHandlers {
mut connection,
@@ -118,7 +125,10 @@ async fn simple_imap_loop(
} = inbox_handlers;
let fut = async move {
connection.connect_configured(&ctx).await.unwrap();
if let Err(err) = connection.connect_configured(&ctx).await {
error!(ctx, "{}", err);
return;
}
loop {
match get_watch_folder(&ctx, folder.as_ref()).await {
@@ -155,7 +165,7 @@ async fn simple_imap_loop(
}
};
fut.race(stop_receiver.recv()).await;
fut.race(stop_receiver.recv().map(|_| ())).await;
shutdown_sender.send(()).await;
}