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

deltachat-ffi: print causes for all errors

Browse Source
This commit is contained in:
link2xt
2023-03-08 08:09:55 +00:00
parent de391155b1
commit 9e03f26992
1 changed files with 22 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
deltachat-ffi/src/lib.rs
View File

@@ -292,12 +292,12 @@ pub unsafe extern "C" fn dc_set_stock_translation(
Some(id) => match ctx.set_stock_translation(id, msg).await { Some(id) => match ctx.set_stock_translation(id, msg).await {
Ok(()) => 1, Ok(()) => 1,
Err(err) => { Err(err) => {
warn!(ctx, "set_stock_translation failed: {}", err); warn!(ctx, "set_stock_translation failed: {err:#}");
0 0
} }
}, },
None => { None => {
warn!(ctx, "invalid stock message id {}", stock_id); warn!(ctx, "invalid stock message id {stock_id}");
0 0
} }
} }
@@ -320,7 +320,7 @@ pub unsafe extern "C" fn dc_set_config_from_qr(
match qr::set_config_from_qr(ctx, &qr).await { match qr::set_config_from_qr(ctx, &qr).await {
Ok(()) => 1, Ok(()) => 1,
Err(err) => { Err(err) => {
error!(ctx, "Failed to create account from QR code: {}", err); error!(ctx, "Failed to create account from QR code: {err:#}");
0 0
} }
} }
@@ -338,7 +338,7 @@ pub unsafe extern "C" fn dc_get_info(context: *const dc_context_t) -> *mut libc:
match ctx.get_info().await { match ctx.get_info().await {
Ok(info) => render_info(info).unwrap_or_default().strdup(), Ok(info) => render_info(info).unwrap_or_default().strdup(),
Err(err) => { Err(err) => {
warn!(ctx, "failed to get info: {}", err); warn!(ctx, "failed to get info: {err:#}");
"".strdup() "".strdup()
} }
} }
@@ -379,7 +379,7 @@ pub unsafe extern "C" fn dc_get_connectivity_html(
match ctx.get_connectivity_html().await { match ctx.get_connectivity_html().await {
Ok(html) => html.strdup(), Ok(html) => html.strdup(),
Err(err) => { Err(err) => {
error!(ctx, "Failed to get connectivity html: {}", err); error!(ctx, "Failed to get connectivity html: {err:#}");
"".strdup() "".strdup()
} }
} }
@@ -1137,7 +1137,7 @@ pub unsafe extern "C" fn dc_get_draft(context: *mut dc_context_t, chat_id: u32)
} }
Ok(None) => ptr::null_mut(), Ok(None) => ptr::null_mut(),
Err(err) => { Err(err) => {
error!(ctx, "Failed to get draft for chat #{}: {}", chat_id, err); error!(ctx, "Failed to get draft for chat #{chat_id}: {err:#}");
ptr::null_mut() ptr::null_mut()
} }
} }
@@ -1727,7 +1727,7 @@ pub unsafe extern "C" fn dc_get_chat_encrinfo(
.await .await
.map(|s| s.strdup()) .map(|s| s.strdup())
.unwrap_or_else(|e| { .unwrap_or_else(|e| {
error!(ctx, "{}", e); error!(ctx, "{e:#}");
ptr::null_mut() ptr::null_mut()
}) })
}) })
@@ -1890,7 +1890,7 @@ pub unsafe extern "C" fn dc_resend_msgs(
let msg_ids = convert_and_prune_message_ids(msg_ids, msg_cnt); let msg_ids = convert_and_prune_message_ids(msg_ids, msg_cnt);
if let Err(err) = block_on(chat::resend_msgs(ctx, &msg_ids)) { if let Err(err) = block_on(chat::resend_msgs(ctx, &msg_ids)) {
error!(ctx, "Resending failed: {}", err); error!(ctx, "Resending failed: {err:#}");
0 0
} else { } else {
1 1
@@ -1931,14 +1931,11 @@ pub unsafe extern "C" fn dc_get_msg(context: *mut dc_context_t, msg_id: u32) ->
// C-core API returns empty messages, do the same // C-core API returns empty messages, do the same
warn!( warn!(
ctx, ctx,
"dc_get_msg called with special msg_id={}, returning empty msg", msg_id "dc_get_msg called with special msg_id={msg_id}, returning empty msg"
); );
message::Message::default() message::Message::default()
} else { } else {
error!( error!(ctx, "dc_get_msg could not retrieve msg_id {msg_id}: {e:#}");
ctx,
"dc_get_msg could not retrieve msg_id {}: {}", msg_id, e
);
return ptr::null_mut(); return ptr::null_mut();
} }
} }
@@ -2131,7 +2128,7 @@ pub unsafe extern "C" fn dc_get_contact_encrinfo(
.await .await
.map(|s| s.strdup()) .map(|s| s.strdup())
.unwrap_or_else(|e| { .unwrap_or_else(|e| {
error!(ctx, "{}", e); error!(ctx, "{e:#}");
ptr::null_mut() ptr::null_mut()
}) })
}) })
@@ -2153,7 +2150,7 @@ pub unsafe extern "C" fn dc_delete_contact(
match Contact::delete(ctx, contact_id).await { match Contact::delete(ctx, contact_id).await {
Ok(_) => 1, Ok(_) => 1,
Err(err) => { Err(err) => {
error!(ctx, "cannot delete contact: {}", err); error!(ctx, "cannot delete contact: {err:#}");
0 0
} }
} }
@@ -2229,7 +2226,7 @@ pub unsafe extern "C" fn dc_imex_has_backup(
Err(err) => { Err(err) => {
// do not bubble up error to the user, // do not bubble up error to the user,
// the ui will expect that the file does not exist or cannot be accessed // the ui will expect that the file does not exist or cannot be accessed
warn!(ctx, "dc_imex_has_backup: {}", err); warn!(ctx, "dc_imex_has_backup: {err:#}");
ptr::null_mut() ptr::null_mut()
} }
} }
@@ -2248,7 +2245,7 @@ pub unsafe extern "C" fn dc_initiate_key_transfer(context: *mut dc_context_t) ->
match imex::initiate_key_transfer(ctx).await { match imex::initiate_key_transfer(ctx).await {
Ok(res) => res.strdup(), Ok(res) => res.strdup(),
Err(err) => { Err(err) => {
error!(ctx, "dc_initiate_key_transfer(): {}", err); error!(ctx, "dc_initiate_key_transfer(): {err:#}");
ptr::null_mut() ptr::null_mut()
} }
} }
@@ -2273,7 +2270,7 @@ pub unsafe extern "C" fn dc_continue_key_transfer(
{ {
Ok(()) => 1, Ok(()) => 1,
Err(err) => { Err(err) => {
warn!(ctx, "dc_continue_key_transfer: {}", err); warn!(ctx, "dc_continue_key_transfer: {err:#}");
0 0
} }
} }
@@ -2704,7 +2701,7 @@ pub unsafe extern "C" fn dc_chatlist_get_chat_id(
match ffi_list.list.get_chat_id(index) { match ffi_list.list.get_chat_id(index) {
Ok(chat_id) => chat_id.to_u32(), Ok(chat_id) => chat_id.to_u32(),
Err(err) => { Err(err) => {
warn!(ctx, "get_chat_id failed: {}", err); warn!(ctx, "get_chat_id failed: {err:#}");
0 0
} }
} }
@@ -2724,7 +2721,7 @@ pub unsafe extern "C" fn dc_chatlist_get_msg_id(
match ffi_list.list.get_msg_id(index) { match ffi_list.list.get_msg_id(index) {
Ok(msg_id) => msg_id.map_or(0, |msg_id| msg_id.to_u32()), Ok(msg_id) => msg_id.map_or(0, |msg_id| msg_id.to_u32()),
Err(err) => { Err(err) => {
warn!(ctx, "get_msg_id failed: {}", err); warn!(ctx, "get_msg_id failed: {err:#}");
0 0
} }
} }
@@ -2883,7 +2880,7 @@ pub unsafe extern "C" fn dc_chat_get_profile_image(chat: *mut dc_chat_t) -> *mut
Ok(Some(p)) => p.to_string_lossy().strdup(), Ok(Some(p)) => p.to_string_lossy().strdup(),
Ok(None) => ptr::null_mut(), Ok(None) => ptr::null_mut(),
Err(err) => { Err(err) => {
error!(ctx, "failed to get profile image: {:?}", err); error!(ctx, "failed to get profile image: {err:#}");
ptr::null_mut() ptr::null_mut()
} }
} }
@@ -3035,7 +3032,7 @@ pub unsafe extern "C" fn dc_chat_get_info_json(
let chat = match chat::Chat::load_from_db(ctx, ChatId::new(chat_id)).await { let chat = match chat::Chat::load_from_db(ctx, ChatId::new(chat_id)).await {
Ok(chat) => chat, Ok(chat) => chat,
Err(err) => { Err(err) => {
error!(ctx, "dc_get_chat_info_json() failed to load chat: {}", err); error!(ctx, "dc_get_chat_info_json() failed to load chat: {err:#}");
return "".strdup(); return "".strdup();
} }
}; };
@@ -3044,7 +3041,7 @@ pub unsafe extern "C" fn dc_chat_get_info_json(
Err(err) => { Err(err) => {
error!( error!(
ctx, ctx,
"dc_get_chat_info_json() failed to get chat info: {}", err "dc_get_chat_info_json() failed to get chat info: {err:#}"
); );
return "".strdup(); return "".strdup();
} }
@@ -3283,7 +3280,7 @@ pub unsafe extern "C" fn dc_msg_get_webxdc_info(msg: *mut dc_msg_t) -> *mut libc
let info = match ffi_msg.message.get_webxdc_info(ctx).await { let info = match ffi_msg.message.get_webxdc_info(ctx).await {
Ok(info) => info, Ok(info) => info,
Err(err) => { Err(err) => {
error!(ctx, "dc_msg_get_webxdc_info() failed to get info: {}", err); error!(ctx, "dc_msg_get_webxdc_info() failed to get info: {err:#}");
return "".strdup(); return "".strdup();
} }
}; };
@@ -4151,7 +4148,7 @@ impl<T: Default, E: std::fmt::Display> ResultExt<T, E> for Result<T, E> {
match self { match self {
Ok(t) => t, Ok(t) => t,
Err(err) => { Err(err) => {
error!(context, "{}: {}", message, err); error!(context, "{message}: {err:#}");
Default::default() Default::default()
} }
} }