diff options
author | Eric Wong <e@80x24.org> | 2020-12-15 11:47:16 +0000 |
---|---|---|
committer | Eric Wong <e@80x24.org> | 2020-12-16 04:40:02 +0000 |
commit | ab11caeb8ae114087636748df4c956d0e625b237 (patch) | |
tree | ec3b961da9b10375851cf658599d871e12bb1b5d /lib/PublicInbox/Daemon.pm | |
parent | a80543303720bfe9c1293370ea2cafe98108a141 (diff) | |
download | public-inbox-ab11caeb8ae114087636748df4c956d0e625b237.tar.gz |
We don't actually need Net::Server::Daemonize to support the --daemonize flag, since the daemonize() sub provided by N::S::D doesn't exactly do the things we want.
Diffstat (limited to 'lib/PublicInbox/Daemon.pm')
-rw-r--r-- | lib/PublicInbox/Daemon.pm | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/lib/PublicInbox/Daemon.pm b/lib/PublicInbox/Daemon.pm index 155707e1..fdedaee7 100644 --- a/lib/PublicInbox/Daemon.pm +++ b/lib/PublicInbox/Daemon.pm @@ -213,16 +213,12 @@ sub daemonize () { chdir '/' or die "chdir failed: $!"; } - - return unless (defined $pid_file || defined $group || defined $user - || $daemonize); - - eval { require Net::Server::Daemonize }; - if ($@) { - die -"Net::Server required for --pid-file, --group, --user, and --daemonize\n$@\n"; + if (defined($pid_file) || defined($group) || defined($user)) { + eval { require Net::Server::Daemonize; 1 } // die <<EOF; +Net::Server required for --pid-file, --group, --user +$@ +EOF } - Net::Server::Daemonize::check_pid_file($pid_file) if defined $pid_file; $uid = Net::Server::Daemonize::get_uid($user) if defined $user; if (defined $group) { |