X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FListener.pm;h=7cedc3493f872df866755e1c2c9d5d545df7c319;hb=23af251dd607c4e75ab1e68063f2c885c48cc035;hp=821c34583e24a75c386bc6f650a3fd1186479f12;hpb=422cbeb718cf2499cd07c9399755d41aea65b1f8;p=public-inbox.git

diff --git a/lib/PublicInbox/Listener.pm b/lib/PublicInbox/Listener.pm
index 821c3458..7cedc349 100644
--- a/lib/PublicInbox/Listener.pm
+++ b/lib/PublicInbox/Listener.pm
@@ -1,16 +1,14 @@
-# Copyright (C) 2015-2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2015-2021 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 #
 # Used by -nntpd for listen sockets
 package PublicInbox::Listener;
 use strict;
-use warnings;
-use base 'PublicInbox::DS';
+use parent 'PublicInbox::DS';
 use Socket qw(SOL_SOCKET SO_KEEPALIVE IPPROTO_TCP TCP_NODELAY);
-use fields qw(post_accept);
-require IO::Handle;
-use PublicInbox::Syscall qw(EPOLLIN EPOLLEXCLUSIVE EPOLLET);
-use Errno qw(EAGAIN ECONNABORTED EPERM);
+use IO::Handle;
+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,11 +20,9 @@ sub new ($$$) {
 	my ($class, $s, $cb) = @_;
 	setsockopt($s, SOL_SOCKET, SO_KEEPALIVE, 1);
 	setsockopt($s, IPPROTO_TCP, TCP_NODELAY, 1); # ignore errors on non-TCP
-	listen($s, 1024);
-	my $self = fields::new($class);
-	$self->SUPER::new($s, EPOLLIN|EPOLLET|EPOLLEXCLUSIVE);
-	$self->{post_accept} = $cb;
-	$self
+	listen($s, 2**31 - 1); # kernel will clamp
+	my $self = bless { post_accept => $cb }, $class;
+	$self->SUPER::new($s, EPOLLIN|EPOLLEXCLUSIVE);
 }
 
 sub event_step {
@@ -40,15 +36,11 @@ sub event_step {
 	# on high-traffic sites.
 	if (my $addr = accept(my $c, $sock)) {
 		IO::Handle::blocking($c, 0); # no accept4 :<
-		$self->{post_accept}->($c, $addr, $sock);
-		$self->requeue;
-	} elsif ($! == EAGAIN || $! == ECONNABORTED || $! == EPERM) {
+		eval { $self->{post_accept}->($c, $addr, $sock) };
+		warn "E: $@\n" if $@;
+	} 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";