From c38111d6f3877cf31d28b0a0339d063df0fa58f6 Mon Sep 17 00:00:00 2001
From: Eric Wong <e@80x24.org>
Date: Mon, 1 Aug 2022 21:24:43 +0000
Subject: daemon: support per-listener env, .psgi, out, err

This allows memory savings by allowing multiple, completely
unrelated-PSGI apps to run within the same process as IMAP,
NNTP, and POP3.
---
 lib/PublicInbox/HTTPD.pm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'lib/PublicInbox/HTTPD.pm')

diff --git a/lib/PublicInbox/HTTPD.pm b/lib/PublicInbox/HTTPD.pm
index bcdbb9f9..e531ee70 100644
--- a/lib/PublicInbox/HTTPD.pm
+++ b/lib/PublicInbox/HTTPD.pm
@@ -16,7 +16,7 @@ sub pi_httpd_async { PublicInbox::HTTPD::Async->new(@_) }
 # we have a different env for ever listener socket for
 # SERVER_NAME, SERVER_PORT and psgi.url_scheme
 # envs: listener FD => PSGI env
-sub new { bless { envs => {} }, __PACKAGE__ }
+sub new { bless { envs => {}, err => \*STDERR }, __PACKAGE__ }
 
 # this becomes {srv_env} in PublicInbox::HTTP
 sub env_for ($$$) {
@@ -28,7 +28,7 @@ sub env_for ($$$) {
 		SERVER_PORT => $port,
 		SCRIPT_NAME => '',
 		'psgi.version' => [ 1, 1 ],
-		'psgi.errors' => \*STDERR,
+		'psgi.errors' => $self->{err},
 		'psgi.url_scheme' => $client->can('accept_SSL') ?
 					'https' : 'http',
 		'psgi.nonblocking' => Plack::Util::TRUE,
@@ -53,8 +53,9 @@ sub env_for ($$$) {
 sub refresh_groups {
 	my ($self) = @_;
 	my $app;
-	if (@main::ARGV) {
-		eval { $app = Plack::Util::load_psgi(@ARGV) };
+	$self->{psgi} //= $main::ARGV[0] if @main::ARGV;
+	if ($self->{psgi}) {
+		eval { $app = Plack::Util::load_psgi($self->{psgi}) };
 		die $@, <<EOM if $@;
 $0 runs in /, command-line paths must be absolute
 EOM
-- 
cgit v1.2.3-24-ge0c7