-# Copyright (C) 2015 all contributors <meta@public-inbox.org>
-# License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
+# Copyright (C) 2015-2018 all contributors <meta@public-inbox.org>
+# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
# contains common daemon code for the nntpd and httpd servers.
# This may be used for read-only IMAP server if we decide to implement it.
package PublicInbox::Daemon;
use IO::Handle;
use IO::Socket;
use Cwd qw/abs_path/;
+use Time::HiRes qw(clock_gettime CLOCK_MONOTONIC);
STDOUT->autoflush(1);
STDERR->autoflush(1);
-require Danga::Socket;
+require PublicInbox::DS;
+require PublicInbox::EvCleanup;
require POSIX;
require PublicInbox::Listener;
require PublicInbox::ParentPipe;
}
sub daemonize () {
- foreach my $i (0..$#ARGV) {
- my $arg = $ARGV[$i];
- next unless -e $arg;
- $ARGV[$i] = abs_path($arg);
- }
- check_absolute('stdout', $stdout);
- check_absolute('stderr', $stderr);
- check_absolute('pid-file', $pid_file);
+ if ($daemonize) {
+ foreach my $i (0..$#ARGV) {
+ my $arg = $ARGV[$i];
+ next unless -e $arg;
+ $ARGV[$i] = abs_path($arg);
+ }
+ check_absolute('stdout', $stdout);
+ check_absolute('stderr', $stderr);
+ check_absolute('pid-file', $pid_file);
- chdir '/' or die "chdir failed: $!";
- open(STDIN, '+<', '/dev/null') or die "redirect stdin failed: $!";
+ chdir '/' or die "chdir failed: $!";
+ }
return unless (defined $pid_file || defined $group || defined $user
|| $daemonize);
};
if ($daemonize) {
- my ($pid, $err) = do_fork();
- die "could not fork: $err\n" unless defined $pid;
+ my $pid = fork;
+ die "could not fork: $!\n" unless defined $pid;
exit if $pid;
+ open(STDIN, '+<', '/dev/null') or
+ die "redirect stdin failed: $!\n";
open STDOUT, '>&STDIN' or die "redirect stdout failed: $!\n";
open STDERR, '>&STDIN' or die "redirect stderr failed: $!\n";
POSIX::setsid();
- ($pid, $err) = do_fork();
- die "could not fork: $err\n" unless defined $pid;
+ $pid = fork;
+ die "could not fork: $!\n" unless defined $pid;
exit if $pid;
}
if (defined $pid_file) {
# killing again terminates immediately:
exit unless @listeners;
- $_->close foreach @listeners; # call Danga::Socket::close
+ $_->close foreach @listeners; # call PublicInbox::DS::close
@listeners = ();
$reason->close if ref($reason) eq 'PublicInbox::ParentPipe';
my $proc_name;
my $warn = 0;
# drop idle connections and try to quit gracefully
- Danga::Socket->SetPostLoopCallback(sub {
+ PublicInbox::DS->SetPostLoopCallback(sub {
my ($dmap, undef) = @_;
my $n = 0;
+ my $now = clock_gettime(CLOCK_MONOTONIC);
foreach my $s (values %$dmap) {
- if ($s->can('busy') && $s->busy) {
+ $s->can('busy') or next;
+ if ($s->busy($now)) {
++$n;
} else {
# close as much as possible, early as possible
"$host:$port";
}
+sub unpack_ipv6 ($) {
+ my ($addr) = @_;
+ my ($port, $host);
+
+ # Socket.pm in Perl 5.14+ supports IPv6:
+ eval {
+ ($port, $host) = Socket::unpack_sockaddr_in6($addr);
+ $host = Socket::inet_ntop(Socket::AF_INET6(), $host);
+ };
+
+ if ($@) {
+ # Perl 5.12 or earlier? SpamAssassin and Net::Server use
+ # Socket6, so it may be installed on our system, already
+ # (otherwise die here):
+ require Socket6;
+
+ ($port, $host) = Socket6::unpack_sockaddr_in6($addr);
+ $host = Socket6::inet_ntop(Socket6::AF_INET6(), $host);
+ }
+ ($host, $port);
+}
+
sub host_with_port ($) {
my ($addr) = @_;
my ($port, $host);
# this eval will die on Unix sockets:
eval {
if (length($addr) >= 28) {
- require Socket6;
- ($port, $host) = Socket6::unpack_sockaddr_in6($addr);
- $host = Socket6::inet_ntop(Socket6::AF_INET6(), $host);
+ ($host, $port) = unpack_ipv6($addr);
$host = "[$host]";
} else {
($port, $host) = Socket::sockaddr_in($addr);
$pid_file .= '.oldbin';
write_pid($pid_file);
}
- my ($pid, $err) = do_fork();
+ my $pid = fork;
unless (defined $pid) {
- warn "fork failed: $err\n";
+ warn "fork failed: $!\n";
return;
}
if ($pid == 0) {
}
}
-sub do_fork () {
- my $new = POSIX::SigSet->new;
- $new->fillset;
- my $old = POSIX::SigSet->new;
- POSIX::sigprocmask(&POSIX::SIG_BLOCK, $new, $old) or die "SIG_BLOCK: $!";
- my $pid = fork;
- my $err = $!;
- POSIX::sigprocmask(&POSIX::SIG_SETMASK, $old) or die "SIG_SETMASK: $!";
- ($pid, $err);
-}
-
sub upgrade_aborted ($) {
my ($p) = @_;
warn "reexec PID($p) died with: $?\n";
return unless defined $unlink_pid && $unlink_pid == $$;
open my $fh, '<', $file or return;
+ local $/ = "\n";
defined(my $read_pid = <$fh>) or return;
chomp $read_pid;
if ($read_pid == $unlink_pid) {
sub master_loop {
pipe(my ($p0, $p1)) or die "failed to create parent-pipe: $!";
pipe(my ($r, $w)) or die "failed to create self-pipe: $!";
+
+ if ($^O eq 'linux') { # 1031: F_SETPIPE_SZ = 1031
+ fcntl($_, 1031, 4096) for ($w, $p1);
+ }
+
IO::Handle::blocking($w, 0);
my $set_workers = $worker_processes;
my @caught;
exit if $quit++;
kill_workers($s);
} elsif ($s eq 'WINCH') {
- $worker_processes = 0;
+ if (-t STDIN || -t STDOUT || -t STDERR) {
+ warn
+"ignoring SIGWINCH since we are not daemonized\n";
+ $SIG{WINCH} = 'IGNORE';
+ } else {
+ $worker_processes = 0;
+ }
} elsif ($s eq 'HUP') {
$worker_processes = $set_workers;
kill_workers($s);
$n = $worker_processes;
}
foreach my $i ($n..($worker_processes - 1)) {
- my ($pid, $err) = do_fork();
+ my $pid = fork;
if (!defined $pid) {
- warn "failed to fork worker[$i]: $err\n";
+ warn "failed to fork worker[$i]: $!\n";
} elsif ($pid == 0) {
$set_user->() if $set_user;
return $p0; # run normal work code
sub daemon_loop ($$) {
my ($refresh, $post_accept) = @_;
+ PublicInbox::EvCleanup::enable(); # early for $refresh
my $parent_pipe;
if ($worker_processes > 0) {
$refresh->(); # preload by default
$SIG{QUIT} = $SIG{INT} = $SIG{TERM} = *worker_quit;
$SIG{USR1} = *reopen_logs;
$SIG{HUP} = $refresh;
+ $SIG{CHLD} = 'DEFAULT';
+ $SIG{$_} = 'IGNORE' for qw(USR2 TTIN TTOU WINCH);
# this calls epoll_create:
@listeners = map {
PublicInbox::Listener->new($_, $post_accept)
} @listeners;
- Danga::Socket->EventLoop;
+ PublicInbox::DS->EventLoop;
$parent_pipe = undef;
}