add some logging, and a more precise teardown for online python tests

This commit is contained in:
holger krekel
2019-07-16 11:18:56 +02:00
parent 8d99444c6a
commit bc904a495d
7 changed files with 53 additions and 21 deletions

View File

@@ -306,7 +306,6 @@ pub unsafe fn dc_close(context: &Context) {
info!(context, 0, "disconnecting SMTP");
context.smtp.clone().lock().unwrap().disconnect();
info!(context, 0, "closing SQL");
context.sql.close(context);
let mut dbfile = context.dbfile.write().unwrap();
free(*dbfile as *mut libc::c_void);

View File

@@ -49,10 +49,10 @@ pub struct dc_job_t {
}
pub unsafe fn dc_perform_imap_jobs(context: &Context) {
dc_log_info(
info!(
context,
0i32,
b"INBOX-jobs started...\x00" as *const u8 as *const libc::c_char,
0,
"INBOX-jobs started...",
);
let probe_imap_network = *context.probe_imap_network.clone().read().unwrap();
@@ -60,13 +60,14 @@ pub unsafe fn dc_perform_imap_jobs(context: &Context) {
*context.perform_inbox_jobs_needed.write().unwrap() = 0;
dc_job_perform(context, 100, probe_imap_network);
dc_log_info(
info!(
context,
0i32,
b"INBOX-jobs ended.\x00" as *const u8 as *const libc::c_char,
0,
"INBOX-jobs ended.",
);
}
unsafe fn dc_job_perform(context: &Context, thread: libc::c_int, probe_network: libc::c_int) {
// info!(context, 0, "dc_job_perform {} {}", thread, probe_network);
let mut select_stmt: *mut sqlite3_stmt;
let mut job = dc_job_t {
job_id: 0,
@@ -133,6 +134,7 @@ unsafe fn dc_job_perform(context: &Context, thread: libc::c_int, probe_network:
let mut tries: libc::c_int = 0i32;
while tries <= 1i32 {
job.try_again = 0i32;
// info!(context, 0, "dc_job_perform action {}", job.action);
match job.action {
5901 => {
dc_job_do_DC_JOB_SEND(context, &mut job);

View File

@@ -477,6 +477,7 @@ impl Imap {
}
}
}
info!(context, 0, "IMAP unsetup_handle2.");
let stream = self.session.lock().unwrap().1.take();
if stream.is_some() {
match stream.unwrap().shutdown(net::Shutdown::Both) {
@@ -487,6 +488,7 @@ impl Imap {
}
}
info!(context, 0, "IMAP unsetup_handle3.");
let mut cfg = self.config.write().unwrap();
cfg.selected_folder = None;
cfg.selected_mailbox = None;