wikimedia/mediawiki-extensions-Echo
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/Echo synced 2024-11-24 07:54:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Make server-side logging always check whether schema is enabled"

Browse source
This commit is contained in:
jenkins-bot 2016-08-19 09:56:56 +00:00 committed by Gerrit Code Review
parent f35c0f0715 2186e9a6b6
commit 9604dd8804
1 changed files with 14 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
includes/EventLogging.php
View file

@ -7,13 +7,22 @@ class MWEchoEventLogging {
/**
* This is the only function that interacts with EventLogging
*
* Logs if logging is enabled for the given $schema.
*
* @param string $schema
* @param array $data
*/
public static function actuallyLogTheEvent( $schema, array $data ) {
protected static function logEvent( $schema, array $data ) {
global $wgEchoConfig;
EventLogging::logEvent( $schema, $wgEchoConfig['eventlogging'][$schema]['revision'], $data );
$schemaConfig = $wgEchoConfig['eventlogging'][$schema];
if ( !$schemaConfig['enabled'] ) {
// If logging for this schema is disabled, it's a no-op.
return;
}
EventLogging::logEvent( $schema, $schemaConfig['revision'], $data );
}
/**
@ -24,10 +33,6 @@ class MWEchoEventLogging {
*/
public static function logSchemaEcho( User $user, EchoEvent $event, $deliveryMethod ) {
global $wgEchoConfig, $wgEchoNotifications;
if ( !$wgEchoConfig['eventlogging']['Echo']['enabled'] ) {
// Only attempt event logging if Echo schema is enabled
return;
}
// Notifications under system category should have -1 as sender id
if ( $event->getCategory() === 'system' ) {
@ -72,7 +77,7 @@ class MWEchoEventLogging {
$data['revisionId'] = $rev->getId();
}
self::actuallyLogTheEvent( 'Echo', $data );
self::logEvent( 'Echo', $data );
}
/**
@ -83,18 +88,13 @@ class MWEchoEventLogging {
public static function logSchemaEchoMail( User $user, $emailDeliveryMode = 'single' ) {
global $wgEchoConfig;
if ( !$wgEchoConfig['eventlogging']['EchoMail']['enabled'] ) {
// Only attempt event logging if EchoMail schema is enabled
return;
}
$data = array(
'version' => $wgEchoConfig['version'],
'recipientUserId' => $user->getId(),
'emailDeliveryMode' => $emailDeliveryMode
);
self::actuallyLogTheEvent( 'EchoMail', $data );
self::logEvent( 'EchoMail', $data );
}
/**
@ -102,12 +102,7 @@ class MWEchoEventLogging {
* @param string $skinName
*/
public static function logEchoInteraction( User $user, $skinName ) {
global $wgEchoConfig;
if ( !$wgEchoConfig['eventlogging']['EchoInteraction']['enabled'] ) {
return;
}
self::actuallyLogTheEvent(
self::logEvent(
'EchoInteraction',
array(
'context' => 'archive',