[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Fix some broke cache key generations

2017-11-20 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/392367 )

Change subject: Fix some broke cache key generations
..


Fix some broke cache key generations

Change-Id: Ib724fe0cfa866351caee89d3451b6c4b7b6a4578
---
M includes/changes/ChangesList.php
M includes/media/TransformationalImageHandler.php
2 files changed, 4 insertions(+), 2 deletions(-)

Approvals:
  Krinkle: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/changes/ChangesList.php b/includes/changes/ChangesList.php
index bc50096..5b8559e 100644
--- a/includes/changes/ChangesList.php
+++ b/includes/changes/ChangesList.php
@@ -576,7 +576,9 @@
return '';
}
$cache = $this->watchMsgCache;
-   return $cache->getWithSetCallback( $count, 
$cache::TTL_INDEFINITE,
+   return $cache->getWithSetCallback(
+   $cache->makeKey( 'watching-users-msg', $count ),
+   $cache::TTL_INDEFINITE,
function () use ( $count ) {
return $this->msg( 
'number_of_watching_users_RCview' )
->numParams( $count )->escaped();
diff --git a/includes/media/TransformationalImageHandler.php 
b/includes/media/TransformationalImageHandler.php
index de438da..85430d2 100644
--- a/includes/media/TransformationalImageHandler.php
+++ b/includes/media/TransformationalImageHandler.php
@@ -512,7 +512,7 @@
$cache = 
MediaWikiServices::getInstance()->getLocalServerObjectCache();
$method = __METHOD__;
return $cache->getWithSetCallback(
-   'imagemagick-version',
+   $cache->makeGlobalKey( 'imagemagick-version' ),
$cache::TTL_HOUR,
function () use ( $method ) {
global $wgImageMagickConvertCommand;

-- 
To view, visit https://gerrit.wikimedia.org/r/392367
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib724fe0cfa866351caee89d3451b6c4b7b6a4578
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Fix some broke cache key generations

2017-11-19 Thread Aaron Schulz (Code Review) 
Aaron Schulz has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/392367 )

Change subject: Fix some broke cache key generations
..

Fix some broke cache key generations

Change-Id: Ib724fe0cfa866351caee89d3451b6c4b7b6a4578
---
M includes/changes/ChangesList.php
M includes/media/TransformationalImageHandler.php
2 files changed, 4 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/67/392367/1

diff --git a/includes/changes/ChangesList.php b/includes/changes/ChangesList.php
index bc50096..5b8559e 100644
--- a/includes/changes/ChangesList.php
+++ b/includes/changes/ChangesList.php
@@ -576,7 +576,9 @@
return '';
}
$cache = $this->watchMsgCache;
-   return $cache->getWithSetCallback( $count, 
$cache::TTL_INDEFINITE,
+   return $cache->getWithSetCallback(
+   $cache->makeKey( 'watching-users-msg', $count ),
+   $cache::TTL_INDEFINITE,
function () use ( $count ) {
return $this->msg( 
'number_of_watching_users_RCview' )
->numParams( $count )->escaped();
diff --git a/includes/media/TransformationalImageHandler.php 
b/includes/media/TransformationalImageHandler.php
index de438da..85430d2 100644
--- a/includes/media/TransformationalImageHandler.php
+++ b/includes/media/TransformationalImageHandler.php
@@ -512,7 +512,7 @@
$cache = 
MediaWikiServices::getInstance()->getLocalServerObjectCache();
$method = __METHOD__;
return $cache->getWithSetCallback(
-   'imagemagick-version',
+   $cache->makeGlobalKey( 'imagemagick-version' ),
$cache::TTL_HOUR,
function () use ( $method ) {
global $wgImageMagickConvertCommand;

-- 
To view, visit https://gerrit.wikimedia.org/r/392367
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib724fe0cfa866351caee89d3451b6c4b7b6a4578
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits