about summary refs log tree commit homepage
path: root/lib
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2021-01-31 22:28:18 -1000
committerEric Wong <e@80x24.org>2021-02-01 11:38:12 +0000
commit9b023d00e86f3990de8767ba5d9d00207febf3c0 (patch)
tree6e446396a82251ad2c29a5a9209a8e7648d90af5 /lib
parent620215dbaa63ecb04923bb29a1ed78606286c192 (diff)
downloadpublic-inbox-9b023d00e86f3990de8767ba5d9d00207febf3c0.tar.gz
It doesn't seem necessary now that we redirect and write
stuff to errors.log, which gets checked every run.
Diffstat (limited to 'lib')
-rw-r--r--lib/PublicInbox/LEI.pm17
1 files changed, 6 insertions, 11 deletions
diff --git a/lib/PublicInbox/LEI.pm b/lib/PublicInbox/LEI.pm
index 22cd20f6..c0b90451 100644
--- a/lib/PublicInbox/LEI.pm
+++ b/lib/PublicInbox/LEI.pm
@@ -14,10 +14,9 @@ use Getopt::Long ();
 use Socket qw(AF_UNIX SOCK_SEQPACKET MSG_EOR pack_sockaddr_un);
 use Errno qw(EPIPE EAGAIN EINTR ECONNREFUSED ENOENT ECONNRESET);
 use Cwd qw(getcwd);
-use POSIX ();
+use POSIX qw(strftime);
 use IO::Handle ();
 use Fcntl qw(SEEK_SET);
-use Sys::Syslog qw(syslog openlog);
 use PublicInbox::Config;
 use PublicInbox::Syscall qw(SFD_NONBLOCK EPOLLIN EPOLLET);
 use PublicInbox::Sigfd;
@@ -1007,9 +1006,9 @@ sub lazy_start {
                                 warn "$path dev/ino changed, quitting\n";
                                 $path = undef;
                         }
-                } elsif (defined($path)) {
-                        warn "stat($path): $!, quitting ...\n";
-                        undef $path; # don't unlink
+                } elsif (defined($path)) { # ENOENT is common
+                        warn "stat($path): $!, quitting ...\n" if $! != ENOENT;
+                        undef $path;
                         $quit->();
                 }
                 return 1 if defined($path);
@@ -1029,18 +1028,14 @@ sub lazy_start {
         # STDIN was redirected to /dev/null above, closing STDERR and
         # STDOUT will cause the calling `lei' client process to finish
         # reading the <$daemon> pipe.
-        openlog($path, 'pid', 'user');
         local $SIG{__WARN__} = sub {
-                $current_lei ? err($current_lei, @_) : syslog('warning', "@_");
+                $current_lei ? err($current_lei, @_) : warn(
+                  strftime('%Y-%m-%dT%H:%M:%SZ', gmtime(time))," $$ ", @_);
         };
-        my $on_destroy = PublicInbox::OnDestroy->new($$, sub {
-                syslog('crit', "$@") if $@;
-        });
         open STDERR, '>&STDIN' or die "redirect stderr failed: $!";
         open STDOUT, '>&STDIN' or die "redirect stdout failed: $!";
         # $daemon pipe to `lei' closed, main loop begins:
         PublicInbox::DS->EventLoop;
-        @$on_destroy = (); # cancel on_destroy if we get here
         exit($exit_code // 0);
 }