Merge branch 'thread-view-skel'

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

diff --git a/lib/PublicInbox/Daemon.pm b/lib/PublicInbox/Daemon.pm
index b76b9ffbf91ac944518aa72d43ed43bcde618174..512bb2083c5c65f84f9627c455780c19b7abc62b 100644 (file)
--- a/lib/PublicInbox/Daemon.pm
+++ b/lib/PublicInbox/Daemon.pm
@@ -180,7 +180,8 @@ sub worker_quit {
                my $n = 0;
 
                foreach my $s (values %$dmap) {
-                       if ($s->can('busy') && $s->busy) {
+                       $s->can('busy') or next;
+                       if ($s->busy) {
                                ++$n;
                        } else {
                                # close as much as possible, early as possible
@@ -375,12 +376,12 @@ sub master_loop {
                                exit if $quit++;
                                kill_workers($s);
                        } elsif ($s eq 'WINCH') {
-                               if (-t STDIN || -t STDOUT || -t STDERR) {
+                               if ($daemonize) {
+                                       $worker_processes = 0;
+                               } else {
                                        warn
-"ignoring SIGWINCH while connected to terminal\n";
+"ignoring SIGWINCH since we are not daemonized\n";
                                        $SIG{WINCH} = 'IGNORE';
-                               } else {
-                                       $worker_processes = 0;
                                }
                        } elsif ($s eq 'HUP') {
                                $worker_processes = $set_workers;