X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FListener.pm;h=7cedc3493f872df866755e1c2c9d5d545df7c319;hb=23af251dd607c4e75ab1e68063f2c885c48cc035;hp=64bba5b0fd7c491e7e1d5641116c83581c3e85e4;hpb=f72e56e40eb41e720fb4dfefc4cd9a8e50971fe7;p=public-inbox.git diff --git a/lib/PublicInbox/Listener.pm b/lib/PublicInbox/Listener.pm index 64bba5b0..7cedc349 100644 --- a/lib/PublicInbox/Listener.pm +++ b/lib/PublicInbox/Listener.pm @@ -7,8 +7,8 @@ use strict; use parent 'PublicInbox::DS'; use Socket qw(SOL_SOCKET SO_KEEPALIVE IPPROTO_TCP TCP_NODELAY); use IO::Handle; -use PublicInbox::Syscall qw(EPOLLIN EPOLLEXCLUSIVE EPOLLET); -use Errno qw(EAGAIN ECONNABORTED EPERM); +use PublicInbox::Syscall qw(EPOLLIN EPOLLEXCLUSIVE); +use Errno qw(EAGAIN ECONNABORTED); # Warn on transient errors, mostly resource limitations. # EINTR would indicate the failure to set NonBlocking in systemd or similar @@ -22,7 +22,7 @@ sub new ($$$) { setsockopt($s, IPPROTO_TCP, TCP_NODELAY, 1); # ignore errors on non-TCP listen($s, 2**31 - 1); # kernel will clamp my $self = bless { post_accept => $cb }, $class; - $self->SUPER::new($s, EPOLLIN|EPOLLET|EPOLLEXCLUSIVE); + $self->SUPER::new($s, EPOLLIN|EPOLLEXCLUSIVE); } sub event_step { @@ -38,14 +38,9 @@ sub event_step { IO::Handle::blocking($c, 0); # no accept4 :< eval { $self->{post_accept}->($c, $addr, $sock) }; warn "E: $@\n" if $@; - $self->requeue; - } elsif ($! == EAGAIN || $! == ECONNABORTED || $! == EPERM) { + } elsif ($! == EAGAIN || $! == ECONNABORTED) { # EAGAIN is common and likely # ECONNABORTED is common with bad connections - # EPERM happens if firewall rules prevent a connection - # on Linux (and everything that emulates Linux). - # Firewall rules are sometimes intentional, so we don't - # warn on EPERM to avoid being too noisy... return; } elsif (my $sym = $ERR_WARN{int($!)}) { warn "W: accept(): $! ($sym)\n";