diff options
Diffstat (limited to 'lib/PublicInbox/WwwAltId.pm')
-rw-r--r-- | lib/PublicInbox/WwwAltId.pm | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/lib/PublicInbox/WwwAltId.pm b/lib/PublicInbox/WwwAltId.pm index bf851984..31d9b607 100644 --- a/lib/PublicInbox/WwwAltId.pm +++ b/lib/PublicInbox/WwwAltId.pm @@ -1,9 +1,9 @@ -# Copyright (C) 2020-2021 all contributors <meta@public-inbox.org> +# Copyright (C) all contributors <meta@public-inbox.org> # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt> # dumps using the ".dump" command of sqlite3(1) package PublicInbox::WwwAltId; -use strict; +use v5.12; use PublicInbox::Qspawn; use PublicInbox::WwwStream qw(html_oneshot); use PublicInbox::AltId; @@ -15,8 +15,7 @@ sub check_output { my ($r, $bref, $ctx) = @_; return html_oneshot($ctx, 500) if !defined($r); if ($r == 0) { - my $err = eval { $ctx->{env}->{'psgi.errors'} } // \*STDERR; - $err->print("unexpected EOF from sqlite3\n"); + warn 'unexpected EOF from sqlite3'; return html_oneshot($ctx, 501); } [200, [ qw(Content-Type application/gzip), 'Content-Disposition', @@ -34,14 +33,14 @@ sub sqldump ($$) { my $altid_map = $ibx->altid_map; my $fn = $altid_map->{$altid_pfx}; unless (defined $fn) { - return html_oneshot($ctx, 404, \<<EOF); + return html_oneshot($ctx, 404, <<EOF); <pre>`$altid_pfx' is not a valid altid for this inbox</pre> EOF } if ($env->{REQUEST_METHOD} ne 'POST') { my $url = $ibx->base_url($ctx->{env}) . "$altid_pfx.sql.gz"; - return html_oneshot($ctx, 405, \<<EOF); + return html_oneshot($ctx, 405, <<EOF); <pre>A POST request is required to retrieve $altid_pfx.sql.gz curl -d '' -O $url @@ -55,24 +54,19 @@ or EOF } - $sqlite3 //= which('sqlite3') // return html_oneshot($ctx, 501, \<<EOF); + $sqlite3 //= which('sqlite3') // return html_oneshot($ctx, 501, <<EOF); <pre>sqlite3 not available The administrator needs to install the sqlite3(1) binary to support gzipped sqlite3 dumps.</pre> EOF - # setup stdin, POSIX requires writes <= 512 bytes to succeed so - # we can close the pipe right away. - pipe(my ($r, $w)) or die "pipe: $!"; - syswrite($w, ".dump\n") == 6 or die "write: $!"; - close($w) or die "close: $!"; - # TODO: use -readonly if available with newer sqlite3(1) - my $qsp = PublicInbox::Qspawn->new([$sqlite3, $fn], undef, { 0 => $r }); + my $qsp = PublicInbox::Qspawn->new([$sqlite3, $fn], undef, + { 0 => \".dump\n" }); $ctx->{altid_pfx} = $altid_pfx; $env->{'qspawn.filter'} = PublicInbox::GzipFilter->new; - $qsp->psgi_return($env, undef, \&check_output, $ctx); + $qsp->psgi_yield($env, undef, \&check_output, $ctx); } 1; |