fix syntax warnings

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

diff --git a/lib/PublicInbox/EvCleanup.pm b/lib/PublicInbox/EvCleanup.pm
index 2b77c617b24f6485c26890b0e6e471209bd26b8b..1a3a3d5e7735b6d8a3f2a12cd6ff4cc2ac7e3500 100644 (file)
--- a/lib/PublicInbox/EvCleanup.pm
+++ b/lib/PublicInbox/EvCleanup.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2016 all contributors <meta@public-inbox.org>
+# Copyright (C) 2016-2018 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 
 # event cleanups (currently for Danga::Socket)
@@ -7,6 +7,10 @@ use strict;
 use warnings;
 use base qw(Danga::Socket);
 use fields qw(rd);
+
+my $ENABLED;
+sub enabled { $ENABLED }
+sub enable { $ENABLED = 1 }
 my $singleton;
 my $asapq = [ [], undef ];
 my $nextq = [ [], undef ];
@@ -30,9 +34,19 @@ sub _run_all ($) {
        $_->() foreach @$run;
 }
 
+# ensure Danga::Socket::ToClose fires after timers fire
+sub _asap_close () { $asapq->[1] ||= _asap_timer() }
+
 sub _run_asap () { _run_all($asapq) }
-sub _run_next () { _run_all($nextq) }
-sub _run_later () { _run_all($laterq) }
+sub _run_next () {
+       _run_all($nextq);
+       _asap_close();
+}
+
+sub _run_later () {
+       _run_all($laterq);
+       _asap_close();
+}
 
 # Called by Danga::Socket
 sub event_write {
@@ -67,8 +81,8 @@ sub later ($) {
 
 END {
        _run_asap();
-       _run_next();
-       _run_later();
+       _run_all($nextq);
+       _run_all($laterq);
 }
 
 1;