treewide: favor open(..., '+<&=', $fd)

[public-inbox.git] / lib / PublicInbox / Daemon.pm

diff --git a/lib/PublicInbox/Daemon.pm b/lib/PublicInbox/Daemon.pm
index 4dcb5fb6f927f416b0e4b2574b7b965535be3637..727311a4aa10eb8d97612022869f3ce9f2e15c5b 100644 (file)
--- a/lib/PublicInbox/Daemon.pm
+++ b/lib/PublicInbox/Daemon.pm
@@ -77,7 +77,7 @@ sub accept_tls_opt ($) {
 sub daemon_prepare ($) {
        my ($default_listen) = @_;
        my $listener_names = {}; # sockname => IO::Handle
-       $oldset = PublicInbox::Sigfd::block_signals();
+       $oldset = PublicInbox::DS::block_signals();
        @CMD = ($0, @ARGV);
        my ($prog) = ($CMD[0] =~ m!([^/]+)\z!g);
        my $help = <<EOF;
@@ -367,7 +367,7 @@ sub inherit ($) {
        my $end = $fds + 2; # LISTEN_FDS_START - 1
        my @rv = ();
        foreach my $fd (3..$end) {
-               my $s = IO::Handle->new_from_fd($fd, 'r');
+               open(my $s, '<&=', $fd) or warn "fdopen fd=$fd: $!";
                if (my $k = sockname($s)) {
                        my $prev_was_blocking = $s->blocking(0);
                        warn <<"" if $prev_was_blocking;
@@ -514,8 +514,8 @@ EOF
                CHLD => \&reap_children,
        };
        my $sigfd = PublicInbox::Sigfd->new($sig, 0);
-       local %SIG = (%SIG, %$sig) if !$sigfd;
-       PublicInbox::Sigfd::sig_setmask($oldset) if !$sigfd;
+       local @SIG{keys %$sig} = values(%$sig) unless $sigfd;
+       PublicInbox::DS::sig_setmask($oldset) if !$sigfd;
        while (1) { # main loop
                my $n = scalar keys %pids;
                unless (@listeners) {
@@ -531,12 +531,15 @@ EOF
                }
                my $want = $worker_processes - 1;
                if ($n <= $want) {
-                       PublicInbox::Sigfd::block_signals() if !$sigfd;
+                       PublicInbox::DS::block_signals() if !$sigfd;
                        for my $i ($n..$want) {
+                               my $seed = rand(0xffffffff);
                                my $pid = fork;
                                if (!defined $pid) {
                                        warn "failed to fork worker[$i]: $!\n";
                                } elsif ($pid == 0) {
+                                       srand($seed);
+                                       eval { Net::SSLeay::randomize() };
                                        $set_user->() if $set_user;
                                        return $p0; # run normal work code
                                } else {
@@ -544,7 +547,7 @@ EOF
                                        $pids{$pid} = $i;
                                }
                        }
-                       PublicInbox::Sigfd::sig_setmask($oldset) if !$sigfd;
+                       PublicInbox::DS::sig_setmask($oldset) if !$sigfd;
                }
 
                if ($sigfd) { # Linux and IO::KQueue users:
@@ -628,11 +631,11 @@ sub daemon_loop ($$$$) {
                PublicInbox::Listener->new($_, $tls_cb || $post_accept)
        } @listeners;
        my $sigfd = PublicInbox::Sigfd->new($sig, SFD_NONBLOCK);
-       local %SIG = (%SIG, %$sig) if !$sigfd;
+       local @SIG{keys %$sig} = values(%$sig) unless $sigfd;
        if (!$sigfd) {
                # wake up every second to accept signals if we don't
                # have signalfd or IO::KQueue:
-               PublicInbox::Sigfd::sig_setmask($oldset);
+               PublicInbox::DS::sig_setmask($oldset);
                PublicInbox::DS->SetLoopTimeout(1000);
        }
        PublicInbox::DS->EventLoop;