This commit is contained in:
holger krekel
2019-07-02 08:36:15 +02:00
parent 2c26f4f2ab
commit 08bade2c7c
2 changed files with 16 additions and 9 deletions

View File

@@ -554,8 +554,12 @@ impl Imap {
s s
}); });
log_event!(context, Event::IMAP_CONNECTED, log_event!(
0, "IMAP-LOGIN as {} ok", as_str(lp.mail_user), context,
Event::IMAP_CONNECTED,
0,
"IMAP-LOGIN as {} ok",
as_str(lp.mail_user),
); );
info!(context, 0, "IMAP-capabilities:{}", caps_list); info!(context, 0, "IMAP-capabilities:{}", caps_list);

View File

@@ -61,10 +61,7 @@ impl Smtp {
let lp = unsafe { *lp }; let lp = unsafe { *lp };
if lp.addr.is_null() || lp.send_server.is_null() || lp.send_port == 0 { if lp.addr.is_null() || lp.send_server.is_null() || lp.send_port == 0 {
log_event!( log_event!(context, Event::ERROR_NETWORK, 0, "SMTP bad parameters.",);
context, Event::ERROR_NETWORK, 0,
"SMTP bad parameters.",
);
} }
let raw_addr = unsafe { let raw_addr = unsafe {
@@ -133,8 +130,12 @@ impl Smtp {
.credentials(creds) .credentials(creds)
.connection_reuse(lettre::smtp::ConnectionReuseParameters::ReuseUnlimited); .connection_reuse(lettre::smtp::ConnectionReuseParameters::ReuseUnlimited);
self.transport = Some(client.transport()); self.transport = Some(client.transport());
log_event!(context, Event::SMTP_CONNECTED, log_event!(
0, "SMTP-LOGIN as {} ok", as_str(lp.send_user), context,
Event::SMTP_CONNECTED,
0,
"SMTP-LOGIN as {} ok",
as_str(lp.send_user),
); );
1 1
} }
@@ -162,7 +163,9 @@ impl Smtp {
match transport.send(mail) { match transport.send(mail) {
Ok(_) => { Ok(_) => {
log_event!( log_event!(
context, Event::SMTP_MESSAGE_SENT, 0, context,
Event::SMTP_MESSAGE_SENT,
0,
"Message was sent to SMTP server", "Message was sent to SMTP server",
); );
self.transport_connected = true; self.transport_connected = true;