diff options
| -rw-r--r-- | lib/PublicInbox/GitAsyncCat.pm | 8 | ||||
| -rw-r--r-- | lib/PublicInbox/ViewVCS.pm | 1 | ||||
| -rw-r--r-- | lib/PublicInbox/WwwStream.pm | 5 |
3 files changed, 6 insertions, 8 deletions
diff --git a/lib/PublicInbox/GitAsyncCat.pm b/lib/PublicInbox/GitAsyncCat.pm index 2d601542..b32c2fd3 100644 --- a/lib/PublicInbox/GitAsyncCat.pm +++ b/lib/PublicInbox/GitAsyncCat.pm @@ -45,12 +45,6 @@ sub event_step { } } -sub git_tmp_cleanup { - my ($git) = @_; - $git->cleanup(1) and - PublicInbox::DS::add_timer(3, \&git_tmp_cleanup, $git); -} - sub ibx_async_cat ($$$$) { my ($ibx, $oid, $cb, $arg) = @_; my $git = $ibx->{git} // $ibx->git; @@ -69,8 +63,6 @@ sub ibx_async_cat ($$$$) { $git->{async_cat} //= do { my $self = bless { git => $git }, __PACKAGE__; $git->{in}->blocking(0); - $git->{-tmp} and PublicInbox::DS::add_uniq_timer( - 3, \&git_tmp_cleanup, $git); $self->SUPER::new($git->{in}, EPOLLIN|EPOLLET); \undef; # this is a true ref() }; diff --git a/lib/PublicInbox/ViewVCS.pm b/lib/PublicInbox/ViewVCS.pm index 915cf2c5..b0f58455 100644 --- a/lib/PublicInbox/ViewVCS.pm +++ b/lib/PublicInbox/ViewVCS.pm @@ -414,6 +414,7 @@ blob $oid $size bytes $raw_link</pre> EOM } @{$ctx->{-paths}} = ($path, $raw_link); + bless $ctx, 'PublicInbox::WwwStream'; # for DESTROY $ctx->{git} = $git; if ($ctx->{env}->{'pi-httpd.async'}) { ibx_async_cat($ctx, $oid, \&show_blob, $ctx); diff --git a/lib/PublicInbox/WwwStream.pm b/lib/PublicInbox/WwwStream.pm index 77b6f9c2..16442d51 100644 --- a/lib/PublicInbox/WwwStream.pm +++ b/lib/PublicInbox/WwwStream.pm @@ -220,4 +220,9 @@ sub html_init { print { $ctx->zfh } html_top($ctx); } +sub DESTROY { + my ($ctx) = @_; + $ctx->{git}->cleanup if $ctx->{git} && $ctx->{git}->{-tmp}; +} + 1; |