X-Git-Url: http://www.git.stargrave.org/?p=public-inbox.git;a=blobdiff_plain;f=lib%2FPublicInbox%2FDaemon.pm;h=b929ec2aa17e1cb83549a41d27035fd578cb8515;hp=e5798a4bf2276abd3e9e6c1aa7c1bff5cd055e99;hb=ee8cadb3a71ab4c951642a96ba123688244de720;hpb=c62ab5b7500bd9e7c584f5972e3c115842598957

diff --git a/lib/PublicInbox/Daemon.pm b/lib/PublicInbox/Daemon.pm
index e5798a4b..b929ec2a 100644
--- a/lib/PublicInbox/Daemon.pm
+++ b/lib/PublicInbox/Daemon.pm
@@ -75,7 +75,7 @@ sub accept_tls_opt ($) {
 sub daemon_prepare ($) {
 	my ($default_listen) = @_;
 	my $listener_names = {}; # sockname => IO::Handle
-	my $oldset = PublicInbox::Sigfd::block_signals();
+	$oldset = PublicInbox::Sigfd::block_signals();
 	@CMD = ($0, @ARGV);
 	my ($prog) = ($CMD[0] =~ m!([^/]+)\z!g);
 	my $help = <<EOF;
@@ -523,7 +523,7 @@ EOF
 	};
 	my $sigfd = PublicInbox::Sigfd->new($sig, 0);
 	local %SIG = (%SIG, %$sig) if !$sigfd;
-	PublicInbox::restore_signals($oldset) if !$sigfd;
+	PublicInbox::Sigfd::sig_setmask($oldset) if !$sigfd;
 	while (1) { # main loop
 		my $n = scalar keys %pids;
 		unless (@listeners) {
@@ -552,7 +552,7 @@ EOF
 					$pids{$pid} = $i;
 				}
 			}
-			PubliInbox::Sigfd::set_sigmask($oldset) if !$sigfd;
+			PublicInbox::Sigfd::sig_setmask($oldset) if !$sigfd;
 		}
 
 		if ($sigfd) { # Linux and IO::KQueue users:
@@ -640,7 +640,7 @@ sub daemon_loop ($$$$) {
 	if (!$sigfd) {
 		# wake up every second to accept signals if we don't
 		# have signalfd or IO::KQueue:
-		PublicInbox::Sigfd::set_sigmask($oldset);
+		PublicInbox::Sigfd::sig_setmask($oldset);
 		PublicInbox::DS->SetLoopTimeout(1000);
 	}
 	PublicInbox::DS->EventLoop;