MANIFEST | 2 +- lib/PublicInbox/LeiDaemon.pm => lib/PublicInbox/LEI.pm | 2 +- script/lei | 8 ++++---- t/lei-oneshot.t | 4 ++-- t/lei.t | 2 +- diff --git a/MANIFEST b/MANIFEST index 898766e7c26f0d12916aebdeea0c777508053995..29b47843345e8f580b931e280d9cf6c01fcb9d79 100644 --- a/MANIFEST +++ b/MANIFEST @@ -159,7 +159,7 @@ lib/PublicInbox/InboxIdle.pm lib/PublicInbox/InboxWritable.pm lib/PublicInbox/Isearch.pm lib/PublicInbox/KQNotify.pm -lib/PublicInbox/LeiDaemon.pm +lib/PublicInbox/LEI.pm lib/PublicInbox/LeiSearch.pm lib/PublicInbox/LeiStore.pm lib/PublicInbox/Linkify.pm diff --git a/lib/PublicInbox/LeiDaemon.pm b/lib/PublicInbox/LEI.pm rename from lib/PublicInbox/LeiDaemon.pm rename to lib/PublicInbox/LEI.pm index 56f4aa7daf9bd646d87503465d13ab9c854672b6..b5ba1f71442e895acec6a508cd712ce96d3df90d 100644 --- a/lib/PublicInbox/LeiDaemon.pm +++ b/lib/PublicInbox/LEI.pm @@ -5,7 +5,7 @@ # Backend for `lei' (local email interface). Unlike the C10K-oriented # PublicInbox::Daemon, this is designed exclusively to handle trusted # local clients with read/write access to the FS and use as many # system resources as the local user has access to. -package PublicInbox::LeiDaemon; +package PublicInbox::LEI; use strict; use v5.10.1; use parent qw(PublicInbox::DS); diff --git a/script/lei b/script/lei index fce088e9336473d3988e05981fc7cc5c631a1fb4..e59e4316785639960b6f708693b9849c46c2db61 100755 --- a/script/lei +++ b/script/lei @@ -23,8 +23,8 @@ my $sock = IO::Socket::UNIX->new(Peer => $path, Type => SOCK_STREAM); unless ($sock) { # start the daemon if not started my $err = $! + 0; my $env = { PERL5LIB => join(':', @INC) }; - my $cmd = [ $^X, qw[-MPublicInbox::LeiDaemon - -E PublicInbox::LeiDaemon::lazy_start(@ARGV)], + my $cmd = [ $^X, qw[-MPublicInbox::LEI + -E PublicInbox::LEI::lazy_start(@ARGV)], $path, $err ]; require PublicInbox::Spawn; waitpid(PublicInbox::Spawn::spawn($cmd, $env), 0); @@ -59,6 +59,6 @@ $line =~ /\Aexit=([0-9]+)\n\z/ and exit($1 + 0); die $line; } } else { # for systems lacking IO::FDPass - require PublicInbox::LeiDaemon; - PublicInbox::LeiDaemon::oneshot(__PACKAGE__); + require PublicInbox::LEI; + PublicInbox::LEI::oneshot(__PACKAGE__); } diff --git a/t/lei-oneshot.t b/t/lei-oneshot.t index 848682eecaf5c1a14af6109612bd68ec6a308af8..3b8e412d3972abdbd47d15da92d41851f750aa09 100644 --- a/t/lei-oneshot.t +++ b/t/lei-oneshot.t @@ -13,8 +13,8 @@ *exit = \&PublicInbox::TestCommon::run_script_exit; sub main { # the below "line" directive is a magic comment, see perlsyn(1) manpage # line 1 "lei-oneshot" - require PublicInbox::LeiDaemon; - PublicInbox::LeiDaemon::oneshot(__PACKAGE__); + require PublicInbox::LEI; + PublicInbox::LEI::oneshot(__PACKAGE__); 0; } 1; diff --git a/t/lei.t b/t/lei.t index 53268908216291ff633db0415609945cebb82a33..7ecadf7dcdba4dd7f353798fd45b122b54906b41 100644 --- a/t/lei.t +++ b/t/lei.t @@ -159,7 +159,7 @@ # success over socket, can't test without $test_lei_common = undef; }; -require_ok 'PublicInbox::LeiDaemon'; +require_ok 'PublicInbox::LEI'; $LEI = 'lei-oneshot' if $test_lei_oneshot; $test_lei_common->() if $test_lei_common;