Reedy has uploaded a new change for review.
https://gerrit.wikimedia.org/r/57184
Change subject: Cache closed, fishbowl and private dblists and reuse
......................................................................
Cache closed, fishbowl and private dblists and reuse
Change-Id: I1e8e800a55fde42028a46c89d893929bd193b39d
---
M wmf-config/CommonSettings.php
1 file changed, 13 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/84/57184/1
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index cb56dbb..7f50393 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -871,9 +871,9 @@
// Config for sitematrix
$wgSiteMatrixFile = '/apache/common/langlist';
-$wgSiteMatrixClosedSites = getRealmSpecificFilename( "$IP/../closed.dblist" );
-$wgSiteMatrixPrivateSites = getRealmSpecificFilename( "$IP/../private.dblist"
);
-$wgSiteMatrixFishbowlSites = getRealmSpecificFilename(
"$IP/../fishbowl.dblist" );
+$wgSiteMatrixClosedSites = array_map( 'trim', file( getRealmSpecificFilename(
"$IP/../closed.dblist" ) );
+$wgSiteMatrixPrivateSites = array_map( 'trim', file( getRealmSpecificFilename(
"$IP/../private.dblist" ) );
+$wgSiteMatrixFishbowlSites = array_map( 'trim', file(
getRealmSpecificFilename( "$IP/../fishbowl.dblist" ) );
include( $IP . '/extensions/CharInsert/CharInsert.php' );
@@ -1543,12 +1543,15 @@
$wgHooks['CentralAuthWikiList'][] = 'wmfCentralAuthWikiList';
function wmfCentralAuthWikiList( &$list ) {
- global $wgLocalDatabases, $IP;
- $privateWikis = array_map( 'trim', file(
getRealmSpecificFilename( "$IP/../private.dblist" ) ) );
- $fishbowlWikis = array_map( 'trim', file(
getRealmSpecificFilename( "$IP/../fishbowl.dblist" ) ) );
- $closedWikis = array_map( 'trim', file(
getRealmSpecificFilename( "$IP/../closed.dblist" ) ) );
- $list = array_diff( $wgLocalDatabases,
- $privateWikis, $fishbowlWikis, $closedWikis );
+ global $wgLocalDatabases, $IP, $wgSiteMatrixPrivateSites,
+ $wgSiteMatrixFishbowlSites, $wgSiteMatrixClosedSites;
+
+ $list = array_diff(
+ $wgLocalDatabases,
+ $wgSiteMatrixPrivateSites,
+ $wgSiteMatrixFishbowlSites,
+ $wgSiteMatrixClosedSites
+ );
return true;
}
@@ -2243,7 +2246,7 @@
if ( $wmgUseIncubator ) {
require_once(
"$IP/extensions/WikimediaIncubator/WikimediaIncubator.php" );
- $wmincClosedWikis = getRealmSpecificFilename( "$IP/../closed.dblist" );
+ $wmincClosedWikis = $wgSiteMatrixClosedSites;
}
if ( $wmgUseWikiLove ) {
--
To view, visit https://gerrit.wikimedia.org/r/57184
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1e8e800a55fde42028a46c89d893929bd193b39d
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
