Merge remote-tracking branch 'origin/master' into v2

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

diff --git a/lib/PublicInbox/EvCleanup.pm b/lib/PublicInbox/EvCleanup.pm
index 8ed5180b76953a12b8163447e6045b3d6cf08576..1a3a3d5e7735b6d8a3f2a12cd6ff4cc2ac7e3500 100644 (file)
--- a/lib/PublicInbox/EvCleanup.pm
+++ b/lib/PublicInbox/EvCleanup.pm
@@ -8,7 +8,9 @@ use warnings;
 use base qw(Danga::Socket);
 use fields qw(rd);
 
-our $ENABLED;
+my $ENABLED;
+sub enabled { $ENABLED }
+sub enable { $ENABLED = 1 }
 my $singleton;
 my $asapq = [ [], undef ];
 my $nextq = [ [], undef ];
@@ -79,8 +81,8 @@ sub later ($) {
 
 END {
        _run_asap();
-       _run_next();
-       _run_later();
+       _run_all($nextq);
+       _run_all($laterq);
 }
 
 1;