From: Eric Wong Date: Mon, 24 Jun 2019 02:52:28 +0000 (+0000) Subject: http: don't pass extra args to PublicInbox::DS::close X-Git-Tag: v1.2.0~156^2~32 X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=2600289573c569fea65a1da817497414175bae55;p=public-inbox.git http: don't pass extra args to PublicInbox::DS::close YAGNI Followup-to: commit 30ab5cf82b9d47242640f748a0f9a088ca783e32 ("ds: reduce Errno imports and drop ->close reason") --- diff --git a/lib/PublicInbox/HTTP.pm b/lib/PublicInbox/HTTP.pm index 94972054..c81aeacd 100644 --- a/lib/PublicInbox/HTTP.pm +++ b/lib/PublicInbox/HTTP.pm @@ -438,7 +438,7 @@ sub quit { } sub close { - my $self = shift; + my $self = $_[0]; if (my $env = delete $self->{env}) { delete $env->{'psgix.io'}; # prevent circular references } @@ -447,7 +447,7 @@ sub close { eval { $forward->close }; err($self, "forward ->close error: $@") if $@; } - $self->SUPER::close(@_); + $self->SUPER::close; # PublicInbox::DS::close } # for graceful shutdown in PublicInbox::Daemon: diff --git a/lib/PublicInbox/HTTPD/Async.pm b/lib/PublicInbox/HTTPD/Async.pm index bec49337..e6df58eb 100644 --- a/lib/PublicInbox/HTTPD/Async.pm +++ b/lib/PublicInbox/HTTPD/Async.pm @@ -80,9 +80,9 @@ sub async_pass { sub event_step { $_[0]->{cb}->(@_) } sub close { - my $self = shift; + my $self = $_[0]; delete $self->{cb}; - $self->SUPER::close(@_); + $self->SUPER::close; # we defer this to the next timer loop since close is deferred if (my $cleanup = delete $self->{cleanup}) {