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

Merge "Conversion to using WAN cache"

Browse source
This commit is contained in:
jenkins-bot 2015-05-05 10:46:57 +00:00 committed by Gerrit Code Review
parent e8eb14a46b ca55c42a1e
commit 89b8b9f1e7
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
BaseBlacklist.php Normal file → Executable file
View file

@ -221,7 +221,7 @@ abstract class BaseBlacklist {
* @return array
*/
function getSharedBlacklists() {
global $wgMemc, $wgDBname;
global $wgDBname;
$listType = $this->getBlacklistType();
wfDebugLog( 'SpamBlacklist', "Loading $listType regex..." );
@ -232,25 +232,27 @@ abstract class BaseBlacklist {
return array();
}
$cache = ObjectCache::getMainWANInstance();
// This used to be cached per-site, but that could be bad on a shared
// server where not all wikis have the same configuration.
$cachedRegexes = $wgMemc->get( "$wgDBname:{$listType}_blacklist_regexes" );
$cachedRegexes = $cache->get( "$wgDBname:{$listType}_blacklist_regexes" );
if( is_array( $cachedRegexes ) ) {
wfDebugLog( 'SpamBlacklist', "Got shared spam regexes from cache\n" );
return $cachedRegexes;
}
$regexes = $this->buildSharedBlacklists();
$wgMemc->set( "$wgDBname:{$listType}_blacklist_regexes", $regexes, $this->expiryTime );
$cache->set( "$wgDBname:{$listType}_blacklist_regexes", $regexes, $this->expiryTime );
return $regexes;
}
function clearCache() {
global $wgMemc, $wgDBname;
global $wgDBname;
$listType = $this->getBlacklistType();
$wgMemc->delete( "$wgDBname:{$listType}_blacklist_regexes" );
$cache = ObjectCache::getMainWANInstance();
$cache->delete( "$wgDBname:{$listType}_blacklist_regexes" );
wfDebugLog( 'SpamBlacklist', "$listType blacklist local cache cleared.\n" );
}

5
SpamBlacklistHooks.php Normal file → Executable file
View file

@ -212,11 +212,12 @@ class SpamBlacklistHooks {
if( !BaseBlacklist::isLocalSource( $wikiPage->getTitle() ) ) {
return true;
}
global $wgMemc, $wgDBname;
global $wgDBname;
$cache = ObjectCache::getMainWANInstance();
// This sucks because every Blacklist needs to be cleared
foreach ( BaseBlacklist::getBlacklistTypes() as $type => $class ) {
$wgMemc->delete( "$wgDBname:{$type}_blacklist_regexes" );
$cache->delete( "$wgDBname:{$type}_blacklist_regexes" );
}
return true;
}