From: Jani Nikula <jani@nikula.org>
To: Tomi Ollila <tomi.ollila@iki.fi>, notmuch@notmuchmail.org
Cc: tomi.ollila@iki.fi
Subject: Re: [PATCH v2 2/5] compact: catch Xapian::Error consistently
Date: Thu, 14 Nov 2013 15:13:41 +0100 [thread overview]
Message-ID: <87y54rm5pm.fsf@nikula.org> (raw)
In-Reply-To: <1384362167-12740-3-git-send-email-tomi.ollila@iki.fi>
The first two patches LGTM.
On Wed, 13 Nov 2013, Tomi Ollila <tomi.ollila@iki.fi> wrote:
> catch Xapian::Error in compact code in lib/database.cc to be consistent
> with other code in addition to not making software crash on uncaught
> other Xapian error.
> ---
> lib/database.cc | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/lib/database.cc b/lib/database.cc
> index 3c008d6..3530cb6 100644
> --- a/lib/database.cc
> +++ b/lib/database.cc
> @@ -918,8 +918,8 @@ notmuch_database_compact (const char *path,
> compactor.add_source (xapian_path);
> compactor.set_destdir (compact_xapian_path);
> compactor.compact ();
> - } catch (Xapian::InvalidArgumentError e) {
> - fprintf (stderr, "Error while compacting: %s\n", e.get_msg().c_str());
> + } catch (const Xapian::Error &error) {
> + fprintf (stderr, "Error while compacting: %s\n", error.get_msg().c_str());
> ret = NOTMUCH_STATUS_XAPIAN_EXCEPTION;
> goto DONE;
> }
> --
> 1.8.3.1
>
> _______________________________________________
> notmuch mailing list
> notmuch@notmuchmail.org
> http://notmuchmail.org/mailman/listinfo/notmuch
next prev parent reply other threads:[~2013-11-14 14:14 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-13 17:02 compactor adjustments v2 Tomi Ollila
2013-11-13 17:02 ` [PATCH v2 1/5] compact: tidy formatting Tomi Ollila
2013-11-13 17:02 ` [PATCH v2 2/5] compact: catch Xapian::Error consistently Tomi Ollila
2013-11-14 14:13 ` Jani Nikula [this message]
2013-11-18 0:33 ` David Bremner
2013-11-13 17:02 ` [PATCH v2 3/5] compact: preserve backup database until compacted database is in place Tomi Ollila
2013-11-14 14:08 ` Jani Nikula
2013-11-13 17:02 ` [PATCH v2 4/5] compact: unconditionally attempt to remove old wip database compact directory Tomi Ollila
2013-11-14 14:02 ` Jani Nikula
2013-11-13 17:02 ` [PATCH v2 5/5] compact: provide user more information on after-compaction failures Tomi Ollila
2013-11-14 14:13 ` Jani Nikula
2013-11-14 16:11 ` David Bremner
2013-11-14 17:23 ` Tomi Ollila
2013-11-17 11:34 ` David Bremner
2013-11-17 15:28 ` Tomi Ollila
2013-11-18 0:53 ` 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=87y54rm5pm.fsf@nikula.org \
--to=jani@nikula.org \
--cc=notmuch@notmuchmail.org \
--cc=tomi.ollila@iki.fi \
/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).