X-Git-Url: http://www.git.stargrave.org/?p=public-inbox.git;a=blobdiff_plain;f=lib%2FPublicInbox%2FDaemon.pm;h=ee746f057d66b5a1df5daa196671026323d72bab;hp=16bae23106e746cd4dd53c7cfb99dcc83693eb79;hb=48af4772698dc3a9bcca06b5397ca13920a31d16;hpb=324098fecf1126233578cc2f6290b4c8fdd9207b diff --git a/lib/PublicInbox/Daemon.pm b/lib/PublicInbox/Daemon.pm index 16bae231..ee746f05 100644 --- a/lib/PublicInbox/Daemon.pm +++ b/lib/PublicInbox/Daemon.pm @@ -11,7 +11,7 @@ use Getopt::Long qw(:config gnu_getopt no_ignore_case auto_abbrev); use IO::Handle; # ->autoflush use IO::Socket; use File::Spec; -use POSIX qw(WNOHANG :signal_h); +use POSIX qw(WNOHANG :signal_h F_SETFD); use Socket qw(IPPROTO_TCP SOL_SOCKET); STDOUT->autoflush(1); STDERR->autoflush(1); @@ -478,15 +478,12 @@ sub upgrade { # $_[0] = signal name or number (unused) return; } if ($pid == 0) { - use Fcntl qw(FD_CLOEXEC F_SETFD F_GETFD); $ENV{LISTEN_FDS} = scalar @listeners; $ENV{LISTEN_PID} = $$; foreach my $s (@listeners) { # @listeners are globs with workers, PI::L w/o workers $s = $s->{sock} if ref($s) eq 'PublicInbox::Listener'; - - my $fl = fcntl($s, F_GETFD, 0); - fcntl($s, F_SETFD, $fl &= ~FD_CLOEXEC); + fcntl($s, F_SETFD, 0) // die "F_SETFD: $!"; } exec @CMD; die "Failed to exec: $!\n";