From: David Bremner <david@tethera.net>
To: notmuch@notmuchmail.org
Subject: [PATCH 2/4] lib: catch error from closed db in n_m_get_message_id
Date: Mon, 29 Jun 2020 22:14:09 -0300 [thread overview]
Message-ID: <20200630011411.612552-3-david@tethera.net> (raw)
In-Reply-To: <20200630011411.612552-1-david@tethera.net>
By catching it at the library top level, we can return an error value.
---
lib/message.cc | 23 +++++++++++++++++++----
lib/notmuch.h | 5 ++---
2 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/lib/message.cc b/lib/message.cc
index 0fa0eb3a..b7a64b1c 100644
--- a/lib/message.cc
+++ b/lib/message.cc
@@ -90,6 +90,18 @@ _notmuch_message_destructor (notmuch_message_t *message)
return 0;
}
+#define LOG_XAPIAN_EXCEPTION(message, error) _log_xapian_exception (__location__, message, error)
+
+static void
+_log_xapian_exception (const char *where, notmuch_message_t *message, const Xapian::Error error) {
+ notmuch_database_t *notmuch = notmuch_message_get_database (message);
+ _notmuch_database_log (notmuch,
+ "A Xapian exception occurred %s retrieving %s : %s\n",
+ where,
+ error.get_msg ().c_str ());
+ notmuch->exception_reported = true;
+}
+
static notmuch_message_t *
_notmuch_message_create_for_document (const void *talloc_owner,
notmuch_database_t *notmuch,
@@ -447,9 +459,6 @@ _notmuch_message_ensure_metadata (notmuch_message_t *message, void *field)
if (status != NOTMUCH_STATUS_SUCCESS)
INTERNAL_ERROR ("unhandled error from notmuch_database_reopen: %s\n",
notmuch_status_to_string (status));
- } catch (const Xapian::Error &error) {
- INTERNAL_ERROR ("A Xapian exception occurred fetching message metadata: %s\n",
- error.get_msg ().c_str ());
}
}
message->last_view = message->notmuch->view;
@@ -507,7 +516,13 @@ _notmuch_message_get_doc_id (notmuch_message_t *message)
const char *
notmuch_message_get_message_id (notmuch_message_t *message)
{
- _notmuch_message_ensure_metadata (message, message->message_id);
+ try {
+ _notmuch_message_ensure_metadata (message, message->message_id);
+ } catch (const Xapian::Error &error) {
+ LOG_XAPIAN_EXCEPTION (message, error);
+ return NULL;
+ }
+
if (! message->message_id)
INTERNAL_ERROR ("Message with document ID of %u has no message ID.\n",
message->doc_id);
diff --git a/lib/notmuch.h b/lib/notmuch.h
index ceb5a018..0dc89547 100644
--- a/lib/notmuch.h
+++ b/lib/notmuch.h
@@ -1363,9 +1363,8 @@ notmuch_message_get_database (const notmuch_message_t *message);
* message is valid, (which is until the query from which it derived
* is destroyed).
*
- * This function will not return NULL since Notmuch ensures that every
- * message has a unique message ID, (Notmuch will generate an ID for a
- * message if the original file does not contain one).
+ * This function will return NULL if triggers an unhandled Xapian
+ * exception.
*/
const char *
notmuch_message_get_message_id (notmuch_message_t *message);
--
2.27.0
next prev parent reply other threads:[~2020-06-30 12:31 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-30 1:14 introduce exception handling at top level of libnotmuch David Bremner
2020-06-30 1:14 ` [PATCH 1/4] test: add known broken test for error handling on closed database David Bremner
2020-06-30 1:14 ` David Bremner [this message]
2020-07-04 15:44 ` [PATCH 2/4] lib: catch error from closed db in n_m_get_message_id Floris Bruynooghe
2020-07-04 17:17 ` David Bremner
2020-07-05 11:17 ` David Bremner
2020-07-08 19:55 ` Floris Bruynooghe
2020-07-08 19:52 ` Floris Bruynooghe
2020-06-30 1:14 ` [PATCH 3/4] test: add known broken test for n_m_get_thread_id on closed db David Bremner
2020-06-30 1:14 ` [PATCH 4/4] lib/message: catch exception in n_m_get_thread_id David Bremner
2020-07-02 19:16 ` introduce exception handling at top level of libnotmuch Daniel Kahn Gillmor
2020-07-04 0:15 ` David Bremner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200630011411.612552-3-david@tethera.net \
--to=david@tethera.net \
--cc=notmuch@notmuchmail.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).