wikimedia/mediawiki-extensions-SpamBlacklist
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/SpamBlacklist synced 2024-11-12 01:01:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

wfMemcKey no more!

Browse source 
Change-Id: I7adcbbc1f198230b3c5b6cf6e8cffb34db6d8c9d
This commit is contained in:
Jack Phoenix 2018-06-28 16:45:40 +03:00
parent 10b13e56ac
commit 09ca11cd7c
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
includes/BaseBlacklist.php
View file

@ -233,9 +233,10 @@ abstract class BaseBlacklist {
public function getLocalBlacklists() {
$that = $this;
$type = $this->getBlacklistType();
$cache = ObjectCache::getMainWANInstance();
return ObjectCache::getMainWANInstance()->getWithSetCallback(
wfMemcKey( 'spamblacklist', $type, 'blacklist-regex' ),
return $cache->getWithSetCallback(
$cache->makeKey( 'spamblacklist', $type, 'blacklist-regex' ),
$this->expiryTime,
function () use ( $that, $type ) {
return SpamRegexBatch::regexesFromMessage( "{$type}-blacklist", $that );
@ -251,9 +252,10 @@ abstract class BaseBlacklist {
public function getWhitelists() {
$that = $this;
$type = $this->getBlacklistType();
$cache = ObjectCache::getMainWANInstance();
return ObjectCache::getMainWANInstance()->getWithSetCallback(
wfMemcKey( 'spamblacklist', $type, 'whitelist-regex' ),
return $cache->getWithSetCallback(
$cache->makeKey( 'spamblacklist', $type, 'whitelist-regex' ),
$this->expiryTime,
function () use ( $that, $type ) {
return SpamRegexBatch::regexesFromMessage( "{$type}-whitelist", $that );
@ -279,10 +281,11 @@ abstract class BaseBlacklist {
$miss = false;
$that = $this;
$regexes = ObjectCache::getMainWANInstance()->getWithSetCallback(
$cache = ObjectCache::getMainWANInstance();
$regexes = $cache->getWithSetCallback(
// This used to be cached per-site, but that could be bad on a shared
// server where not all wikis have the same configuration.
wfMemcKey( 'spamblacklist', $listType, 'shared-blacklist-regex' ),
$cache->makeKey( 'spamblacklist', $listType, 'shared-blacklist-regex' ),
$this->expiryTime,
function () use ( $that, &$miss ) {
$miss = true;
@ -306,9 +309,9 @@ abstract class BaseBlacklist {
$listType = $this->getBlacklistType();
$cache = ObjectCache::getMainWANInstance();
$cache->delete( wfMemcKey( 'spamblacklist', $listType, 'shared-blacklist-regex' ) );
$cache->delete( wfMemcKey( 'spamblacklist', $listType, 'blacklist-regex' ) );
$cache->delete( wfMemcKey( 'spamblacklist', $listType, 'whitelist-regex' ) );
$cache->delete( $cache->makeKey( 'spamblacklist', $listType, 'shared-blacklist-regex' ) );
$cache->delete( $cache->makeKey( 'spamblacklist', $listType, 'blacklist-regex' ) );
$cache->delete( $cache->makeKey( 'spamblacklist', $listType, 'whitelist-regex' ) );
wfDebugLog( 'SpamBlacklist', "$listType blacklist local cache cleared.\n" );
}