mirror of
https://gerrit.wikimedia.org/r/mediawiki/extensions/MultimediaViewer
synced 2024-09-29 05:07:36 +00:00
Merge "Add the ability to apply a different duration sampling factor to loggedin users"
This commit is contained in:
commit
8a8b3b0208
|
@ -35,6 +35,16 @@ if ( !isset( $wgMediaViewerDurationLoggingSamplingFactor ) ) {
|
||||||
$wgMediaViewerDurationLoggingSamplingFactor = false;
|
$wgMediaViewerDurationLoggingSamplingFactor = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ( !isset( $wgMediaViewerDurationLoggingLoggedinSamplingFactor ) ) {
|
||||||
|
/**
|
||||||
|
* If set, records loading times via EventLogging with factor specific to loggedin users.
|
||||||
|
* A value of 1000 means there will be an 1:1000 chance to log the duration event.
|
||||||
|
* False if unset.
|
||||||
|
* @var int|bool
|
||||||
|
*/
|
||||||
|
$wgMediaViewerDurationLoggingLoggedinSamplingFactor = false;
|
||||||
|
}
|
||||||
|
|
||||||
if ( !isset( $wgMediaViewerAttributionLoggingSamplingFactor ) ) {
|
if ( !isset( $wgMediaViewerAttributionLoggingSamplingFactor ) ) {
|
||||||
/**
|
/**
|
||||||
* If set, records whether image attribution data was available. A value of 1000 means there will be an
|
* If set, records whether image attribution data was available. A value of 1000 means there will be an
|
||||||
|
|
|
@ -140,14 +140,16 @@ class MultimediaViewerHooks {
|
||||||
*/
|
*/
|
||||||
public static function resourceLoaderGetConfigVars( &$vars ) {
|
public static function resourceLoaderGetConfigVars( &$vars ) {
|
||||||
global $wgMediaViewerActionLoggingSamplingFactorMap, $wgNetworkPerformanceSamplingFactor,
|
global $wgMediaViewerActionLoggingSamplingFactorMap, $wgNetworkPerformanceSamplingFactor,
|
||||||
$wgMediaViewerDurationLoggingSamplingFactor, $wgMediaViewerAttributionLoggingSamplingFactor,
|
$wgMediaViewerDurationLoggingSamplingFactor, $wgMediaViewerDurationLoggingLoggedinSamplingFactor,
|
||||||
$wgMediaViewerDimensionLoggingSamplingFactor, $wgMediaViewerIsInBeta, $wgMediaViewerUseThumbnailGuessing;
|
$wgMediaViewerAttributionLoggingSamplingFactor, $wgMediaViewerDimensionLoggingSamplingFactor,
|
||||||
|
$wgMediaViewerIsInBeta, $wgMediaViewerUseThumbnailGuessing;
|
||||||
$vars['wgMultimediaViewer'] = array(
|
$vars['wgMultimediaViewer'] = array(
|
||||||
'infoLink' => self::$infoLink,
|
'infoLink' => self::$infoLink,
|
||||||
'discussionLink' => self::$discussionLink,
|
'discussionLink' => self::$discussionLink,
|
||||||
'helpLink' => self::$helpLink,
|
'helpLink' => self::$helpLink,
|
||||||
'useThumbnailGuessing' => (bool)$wgMediaViewerUseThumbnailGuessing,
|
'useThumbnailGuessing' => (bool)$wgMediaViewerUseThumbnailGuessing,
|
||||||
'durationSamplingFactor' => $wgMediaViewerDurationLoggingSamplingFactor,
|
'durationSamplingFactor' => $wgMediaViewerDurationLoggingSamplingFactor,
|
||||||
|
'durationSamplingFactorLoggedin' => $wgMediaViewerDurationLoggingLoggedinSamplingFactor,
|
||||||
'networkPerformanceSamplingFactor' => $wgNetworkPerformanceSamplingFactor,
|
'networkPerformanceSamplingFactor' => $wgNetworkPerformanceSamplingFactor,
|
||||||
'actionLoggingSamplingFactorMap' => $wgMediaViewerActionLoggingSamplingFactorMap,
|
'actionLoggingSamplingFactorMap' => $wgMediaViewerActionLoggingSamplingFactorMap,
|
||||||
'attributionSamplingFactor' => $wgMediaViewerAttributionLoggingSamplingFactor,
|
'attributionSamplingFactor' => $wgMediaViewerAttributionLoggingSamplingFactor,
|
||||||
|
|
|
@ -38,6 +38,11 @@
|
||||||
*/
|
*/
|
||||||
L.samplingFactor = mw.config.get( 'wgMultimediaViewer' ).durationSamplingFactor;
|
L.samplingFactor = mw.config.get( 'wgMultimediaViewer' ).durationSamplingFactor;
|
||||||
|
|
||||||
|
// If a sampling factor specific to loggedin users is set and we're logged in, apply it
|
||||||
|
if ( mw.config.get( 'wgMultimediaViewer' ).durationSamplingFactorLoggedin && !mw.user.isAnon() ) {
|
||||||
|
L.samplingFactor = mw.config.get( 'wgMultimediaViewer' ).durationSamplingFactorLoggedin;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @override
|
* @override
|
||||||
* @inheritdoc
|
* @inheritdoc
|
||||||
|
|
Loading…
Reference in a new issue