It's possible to have many coderepos with no inbox association
that never see git->cleanup. So instead of tying git->cleanup
to inboxes, ensure it gets armed when ->watch_async is called
(since it's only called in our -netd or -httpd servers).
---
lib/PublicInbox/Git.pm | 6 ++++--
lib/PublicInbox/Inbox.pm | 4 ----
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/lib/PublicInbox/Git.pm b/lib/PublicInbox/Git.pm
index 9c26d8bf..f4a24f2a 100644
--- a/lib/PublicInbox/Git.pm
+++ b/lib/PublicInbox/Git.pm
@@ -668,8 +668,10 @@ sub event_step {
# idempotently registers with DS epoll/kqueue/select/poll
sub watch_async ($) {
- $_[0]->{epwatch} //= do {
- $_[0]->SUPER::new($_[0]->{sock}, EPOLLIN);
+ my ($self) = @_;
+ PublicInbox::DS::add_uniq_timer($self+0, 30, \&cleanup, $self, 1);
+ $self->{epwatch} //= do {
+ $self->SUPER::new($self->{sock}, EPOLLIN);
\undef;
}
}
diff --git a/lib/PublicInbox/Inbox.pm b/lib/PublicInbox/Inbox.pm
index 3dad7004..b31f3fff 100644
--- a/lib/PublicInbox/Inbox.pm
+++ b/lib/PublicInbox/Inbox.pm
@@ -33,9 +33,6 @@ sub do_cleanup {
}
my $srch = $ibx->{search} // $ibx;
delete @$srch{qw(xdb qp)};
- for my $git (@{$ibx->{-repo_objs} // []}) {
- $live = 1 if $git->cleanup(1);
- }
PublicInbox::DS::add_uniq_timer($ibx+0, 5, \&do_cleanup, $ibx) if $live;
}
@@ -116,7 +113,6 @@ sub git {
my $g = PublicInbox::Git->new($git_dir);
my $lim = $self->{-httpbackend_limiter};
$g->{-httpbackend_limiter} = $lim if $lim;
- _cleanup_later($self);
$g;
};
}