ds: pass $self to code references

[public-inbox.git] / lib / PublicInbox / HTTP.pm

diff --git a/lib/PublicInbox/HTTP.pm b/lib/PublicInbox/HTTP.pm
index 4738e15667a7cbda30c0ba2a4108661977b0dd02..e132c6105f4ac9f66f495bd21a45753125e0b63c 100644 (file)
--- a/lib/PublicInbox/HTTP.pm
+++ b/lib/PublicInbox/HTTP.pm
@@ -118,8 +118,7 @@ sub read_input ($) {
 
        # env->{CONTENT_LENGTH} (identity)
        my $sock = $self->{sock};
-       my $len = $self->{input_left};
-       $self->{input_left} = undef;
+       my $len = delete $self->{input_left};
        my $rbuf = \($self->{rbuf});
        my $input = $env->{'psgi.input'};
 
@@ -246,10 +245,9 @@ sub next_request ($) {
 sub response_done_cb ($$) {
        my ($self, $alive) = @_;
        sub {
-               my $env = $self->{env};
-               $self->{env} = undef;
+               my $env = delete $self->{env};
                $self->write(\"0\r\n\r\n") if $alive == 2;
-               $self->write(sub{$alive ? next_request($self) : $self->close});
+               $self->write($alive ? \&next_request : \&close);
        }
 }
 
@@ -279,7 +277,7 @@ sub getline_cb ($$$) {
                }
        }
 
-       $self->{forward} = $self->{pull} = undef;
+       delete @$self{qw(forward pull)};
        # avoid recursion
        if ($forward) {
                eval { $forward->close };
@@ -370,8 +368,7 @@ sub read_input_chunked { # unlikely...
        my ($self) = @_;
        my $input = $self->{env}->{'psgi.input'};
        my $sock = $self->{sock};
-       my $len = $self->{input_left};
-       $self->{input_left} = undef;
+       my $len = delete $self->{input_left};
        my $rbuf = \($self->{rbuf});
 
        while (1) { # chunk start
@@ -441,16 +438,16 @@ sub quit {
 }
 
 sub close {
-       my $self = shift;
-       my $forward = $self->{forward};
-       my $env = $self->{env};
-       delete $env->{'psgix.io'} if $env; # prevent circular references
-       $self->{pull} = $self->{forward} = $self->{env} = undef;
-       if ($forward) {
+       my $self = $_[0];
+       if (my $env = delete $self->{env}) {
+               delete $env->{'psgix.io'}; # prevent circular references
+       }
+       delete $self->{pull};
+       if (my $forward = delete $self->{forward}) {
                eval { $forward->close };
                err($self, "forward ->close error: $@") if $@;
        }
-       $self->SUPER::close(@_);
+       $self->SUPER::close; # PublicInbox::DS::close
 }
 
 # for graceful shutdown in PublicInbox::Daemon:
@@ -459,4 +456,11 @@ sub busy () {
        ($self->{rbuf} ne '' || $self->{env} || $self->{wbuf});
 }
 
+# fires after pending writes are complete:
+sub restart_pass ($) {
+       $_[0]->{forward}->restart_read; # see PublicInbox::HTTPD::Async
+}
+
+sub enqueue_restart_pass ($) { $_[0]->write(\&restart_pass) }
+
 1;