Reedy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/326454 )

Change subject: Purge all expired Throttles when running pingLimiter
......................................................................

Purge all expired Throttles when running pingLimiter

Done in a DeferredUpdate

Bug: T147363
Change-Id: I1713679e08e25ebfc1de46988de375a786431865
---
M ThrottleOverride.hooks.php
1 file changed, 14 insertions(+), 7 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ThrottleOverride 
refs/changes/54/326454/1

diff --git a/ThrottleOverride.hooks.php b/ThrottleOverride.hooks.php
index f70b162..2351ff0 100644
--- a/ThrottleOverride.hooks.php
+++ b/ThrottleOverride.hooks.php
@@ -74,15 +74,22 @@
                        $result = false;
 
                        return false;
-               } elseif ( $expiry !== false ) {
-                       // Expired exemption. Delete it from the DB.
-                       wfGetDB( DB_MASTER )->delete(
-                               'throttle_override',
-                               $conds,
-                               __METHOD__
-                       );
                }
 
+               DeferredUpdates::addCallableUpdate(
+                       function() {
+                               $db = wfGetDB( DB_MASTER );
+                               $now = $db->addQuotes( MWTimestamp::now( TS_MW 
) );
+                               $db->delete(
+                                       'throttle_override',
+                                       [
+                                               "thr_expiry <= $now"
+                                       ],
+                                       'ThrottleOverrideHooks::onPingLimiter'
+                               );
+                       }
+               );
+
                return true;
        }
 

-- 
To view, visit https://gerrit.wikimedia.org/r/326454
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1713679e08e25ebfc1de46988de375a786431865
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ThrottleOverride
Gerrit-Branch: master
Gerrit-Owner: Reedy <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to