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

re-enabling smtp_config_task - still fine

Browse Source
This commit is contained in:
B. Petersen
2020-10-22 00:03:28 +02:00
parent 7e3029aa9c
commit ea9252925c
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/configure/mod.rs
View File

@@ -7,7 +7,7 @@ mod server_params;
use anyhow::{bail, ensure, Context as _, Result}; use anyhow::{bail, ensure, Context as _, Result};
use async_std::prelude::*; use async_std::prelude::*;
//use async_std::task; use async_std::task;
use itertools::Itertools; use itertools::Itertools;
use job::Action; use job::Action;
use percent_encoding::{utf8_percent_encode, NON_ALPHANUMERIC}; use percent_encoding::{utf8_percent_encode, NON_ALPHANUMERIC};
@@ -258,7 +258,7 @@ async fn configure(ctx: &Context, param: &mut LoginParam) -> Result<()> {
.cloned() .cloned()
.collect(); .collect();
//let smtp_config_task = task::spawn(async move { let smtp_config_task = task::spawn(async move {
let mut smtp_configured = false; let mut smtp_configured = false;
let mut errors = Vec::new(); let mut errors = Vec::new();
for smtp_server in smtp_servers { for smtp_server in smtp_servers {
@@ -278,10 +278,12 @@ async fn configure(ctx: &Context, param: &mut LoginParam) -> Result<()> {
} }
} }
if !smtp_configured { if smtp_configured {
bail!(nicer_configuration_error(ctx, errors).await); Ok(smtp_param)
} else {
Err(errors)
} }
//}); });
progress!(ctx, 600); progress!(ctx, 600);
@@ -321,14 +323,14 @@ async fn configure(ctx: &Context, param: &mut LoginParam) -> Result<()> {
progress!(ctx, 850); progress!(ctx, 850);
// Wait for SMTP configuration // Wait for SMTP configuration
/*match smtp_config_task.await { match smtp_config_task.await {
Ok(smtp_param) => { Ok(smtp_param) => {
param.smtp = smtp_param; param.smtp = smtp_param;
} }
Err(errors) => { Err(errors) => {
bail!(nicer_configuration_error(ctx, errors).await); bail!(nicer_configuration_error(ctx, errors).await);
} }
}*/ }
progress!(ctx, 900); progress!(ctx, 900);