From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 09/10] lei: fix error reporting from lei/store -> lei-daemon
Date: Tue, 31 Aug 2021 11:21:25 +0000 [thread overview]
Message-ID: <20210831112126.13406-10-e@80x24.org> (raw)
In-Reply-To: <20210831112126.13406-1-e@80x24.org>
We must set autoflush to ensure timely notification of clients;
and lei-daemon must not block when waiting on reads in case of
spurious wakeups.
Finally, if no clients are connected to lei-daemon, write to
syslog to ensure the error is visible.
---
lib/PublicInbox/LeiStore.pm | 2 ++
lib/PublicInbox/LeiStoreErr.pm | 14 ++++++++++++--
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/lib/PublicInbox/LeiStore.pm b/lib/PublicInbox/LeiStore.pm
index 5a48c064..0652137e 100644
--- a/lib/PublicInbox/LeiStore.pm
+++ b/lib/PublicInbox/LeiStore.pm
@@ -28,6 +28,7 @@ use PublicInbox::Spawn qw(spawn);
use List::Util qw(max);
use File::Temp ();
use POSIX ();
+use IO::Handle (); # ->autoflush
sub new {
my (undef, $dir, $opt) = @_;
@@ -514,6 +515,7 @@ sub write_prepare {
$self->ipc_lock_init("$dir/ipc.lock");
substr($dir, -length('/lei/store'), 10, '');
pipe(my ($r, $w)) or die "pipe: $!";
+ $w->autoflush(1);
# Mail we import into lei are private, so headers filtered out
# by -mda for public mail are not appropriate
local @PublicInbox::MDA::BAD_HEADERS = ();
diff --git a/lib/PublicInbox/LeiStoreErr.pm b/lib/PublicInbox/LeiStoreErr.pm
index 68ce96d6..5f9ba24d 100644
--- a/lib/PublicInbox/LeiStoreErr.pm
+++ b/lib/PublicInbox/LeiStoreErr.pm
@@ -8,22 +8,32 @@ use strict;
use v5.10.1;
use parent qw(PublicInbox::DS);
use PublicInbox::Syscall qw(EPOLLIN EPOLLONESHOT);
+use Sys::Syslog qw(openlog syslog closelog);
+use IO::Handle (); # ->blocking
sub new {
my ($cls, $rd, $lei) = @_;
my $self = bless { sock => $rd, store_path => $lei->store_path }, $cls;
+ $rd->blocking(0);
$self->SUPER::new($rd, EPOLLIN | EPOLLONESHOT);
}
sub event_step {
my ($self) = @_;
- $self->do_read(\(my $rbuf), 4096) or return;
+ my $rbuf = $self->{rbuf} // \(my $x = '');
+ $self->do_read($rbuf, 8192, length($$rbuf)) or return;
my $cb;
+ my $printed;
for my $lei (values %PublicInbox::DS::DescriptorMap) {
$cb = $lei->can('store_path') // next;
next if $cb->($lei) ne $self->{store_path};
my $err = $lei->{2} // next;
- print $err $rbuf;
+ print $err $$rbuf and $printed = 1;
+ }
+ if (!$printed) {
+ openlog('lei-store', 'pid,nowait,nofatal,ndelay', 'user');
+ for my $l (split(/\n/, $$rbuf)) { syslog('warning', '%s', $l) }
+ closelog(); # don't share across fork
}
}
next prev parent reply other threads:[~2021-08-31 11:21 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-31 11:21 [PATCH 00/10] lei: several bug fixes and refinements Eric Wong
2021-08-31 11:21 ` [PATCH 01/10] lei_mail_sync: forget_folder: simplify code Eric Wong
2021-08-31 11:21 ` [PATCH 02/10] lei prune-mail-sync: handle --all (no args) Eric Wong
2021-08-31 11:21 ` [PATCH 03/10] lei_mail_sync: simplify group2folders Eric Wong
2021-08-31 11:21 ` [PATCH 04/10] lei_mail_sync: make rename_folder more robust Eric Wong
2021-08-31 11:21 ` [PATCH 05/10] t/lei-watch: avoid race between glob + readlink Eric Wong
2021-08-31 11:21 ` [PATCH 06/10] lei note-event: always flush changes on daemon exit Eric Wong
2021-08-31 11:21 ` [PATCH 07/10] lei: refresh watches before MUA spawn for Maildir Eric Wong
2021-08-31 11:21 ` [PATCH 08/10] lei_mail_sync: set_src uses binary OIDs Eric Wong
2021-08-31 11:21 ` Eric Wong [this message]
2021-08-31 11:21 ` [PATCH 10/10] lei/store: correctly delete entries from over Eric Wong
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://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210831112126.13406-10-e@80x24.org \
--to=e@80x24.org \
--cc=meta@public-inbox.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.
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).