From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.2 required=3.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF shortcircuit=no autolearn=ham autolearn_force=no version=3.4.6 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 2A1BD1F698 for ; Tue, 27 Dec 2022 12:51:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=80x24.org; s=selector1; t=1672145515; bh=pw+JO8wdhGJTMUTTVgg8lvHEiHCKC3yG3JOizwlAr+4=; h=From:To:Subject:Date:From; b=J3+x+M5JAcqnjr8cE1HkvQmqSquSbjnMrK1OvihruVw6zWDlM6SUfNVz2nUMm11H2 s2A+96COP8n3colLR5FmNqDj+QWb93WZCyWV36X5+35kO17NyKEHZIQpSiSXC+AR7P uZWbmqRjGzcDkHhM7m5bX2W5mZ0r6jOGpH/RqLG0= From: Eric Wong To: meta@public-inbox.org Subject: [PATCH] qspawn: more generic command chaining Date: Tue, 27 Dec 2022 12:51:55 +0000 Message-Id: <20221227125155.976571-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: Move the chaining logic into qspawn so we can gracefully try other commands when cgit or git-http-backend refuses to service a request for us. --- lib/PublicInbox/GitHTTPBackend.pm | 9 +++------ lib/PublicInbox/Qspawn.pm | 7 ++++++- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/lib/PublicInbox/GitHTTPBackend.pm b/lib/PublicInbox/GitHTTPBackend.pm index 974a1831..e84d4ff8 100644 --- a/lib/PublicInbox/GitHTTPBackend.pm +++ b/lib/PublicInbox/GitHTTPBackend.pm @@ -154,12 +154,9 @@ sub parse_cgi_headers { # {parse_hdr} for Qspawn delete $ctx->{env}->{'qspawn.wcb'}; $ctx->{env}->{'plack.skip-deflater'} = 1; # prevent 2x gzip my $res = $ctx->{www}->coderepo->srv(\%ctx); - if (ref($res) eq 'CODE') { - $res->(delete $ctx{env}->{'qspawn.wcb'}); - } else { # ref($res) eq 'ARRAY' - $ctx->{env}->{'qspawn.wcb'} = $ctx{env}->{'qspawn.wcb'}; - } - $res; # non ARRAY ref for ->psgi_return_init_cb + # for ->psgi_return_init_cb: + $ctx->{env}->{'qspawn.wcb'} = $ctx{env}->{'qspawn.wcb'}; + $res; # CODE or ARRAY ref } else { [ $code, \@h ] } diff --git a/lib/PublicInbox/Qspawn.pm b/lib/PublicInbox/Qspawn.pm index 6e245389..9ca6b3db 100644 --- a/lib/PublicInbox/Qspawn.pm +++ b/lib/PublicInbox/Qspawn.pm @@ -237,7 +237,12 @@ sub psgi_return_init_cb { $self->{rpipe}->close; event_step($self); } - $wcb->($r) if ref($r) eq 'ARRAY'; + if (ref($r) eq 'ARRAY') { # error + $wcb->($r) + } elsif (ref($r) eq 'CODE') { # chain another command + $r->($wcb) + } + # else do nothing } elsif ($async) { # done reading headers, handoff to read body my $fh = $wcb->($r); # scalar @$r == 2