jenkins-bot has submitted this change and it was merged.
Change subject: Fixup memcached support for new WMF memcached config
......................................................................
Fixup memcached support for new WMF memcached config
Change-Id: I51b612e767f6fd29b33304ea90a2040f473d62bf
---
M EventLogging.hooks.php
1 file changed, 5 insertions(+), 6 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/EventLogging.hooks.php b/EventLogging.hooks.php
index 9565a85..423269b 100644
--- a/EventLogging.hooks.php
+++ b/EventLogging.hooks.php
@@ -17,7 +17,11 @@
* configuration variable (if any).
*/
public static function onSetup() {
- global $wgMemCachedServers;
+ global $wgMemc;
+
+ if ( get_class( $wgMemc ) === 'EmptyBagOStuff' ) {
+ wfDebugLog( 'EventLogging', 'No suitable memcached
driver found.' );
+ }
foreach ( array(
'wgEventLoggingBaseUri',
@@ -28,11 +32,6 @@
if ( $GLOBALS[ $configVar ] === false ) {
wfDebugLog( 'EventLogging', "$configVar has not
been configured." );
}
- }
-
- if ( !count( $wgMemCachedServers ) ) {
- wfDebugLog( 'EventLogging', 'EventLogging requires
memcached, '
- . 'and no memcached servers are defined.' );
}
}
--
To view, visit https://gerrit.wikimedia.org/r/51627
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I51b612e767f6fd29b33304ea90a2040f473d62bf
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/EventLogging
Gerrit-Branch: master
Gerrit-Owner: Reedy <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: Reedy <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
