lib/PublicInbox/EvCleanup.pm | 12 ++++-------- diff --git a/lib/PublicInbox/EvCleanup.pm b/lib/PublicInbox/EvCleanup.pm index a9f6167dff25c9054ef83a3b81c27f76cf8d847f..33b54ebc05fb6ef0c7af0d1cbbba7d1378e805e5 100644 --- a/lib/PublicInbox/EvCleanup.pm +++ b/lib/PublicInbox/EvCleanup.pm @@ -46,7 +46,9 @@ # ensure PublicInbox::DS::ToClose processing after timers fire sub _asap_close () { $asapq->[1] ||= _asap_timer() } -sub _run_asap () { _run_all($asapq) } +# Called by PublicInbox::DS +sub event_step { _run_all($asapq) } + sub _run_next () { _run_all($nextq); _asap_close(); @@ -55,12 +57,6 @@ sub _run_later () { _run_all($laterq); _asap_close(); -} - -# Called by PublicInbox::DS -sub event_step { - my ($self) = @_; - _run_asap(); } sub _asap_timer () { @@ -88,7 +84,7 @@ $laterq->[1] ||= PublicInbox::DS->AddTimer(60, *_run_later); } END { - _run_asap(); + event_step(); _run_all($nextq); _run_all($laterq); }