dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Add .pipeline/ with dev image variant"
[lhc/web/wiklou.git]
/
includes
/
deferred
/
CdnCacheUpdate.php
diff --git
a/includes/deferred/CdnCacheUpdate.php
b/includes/deferred/CdnCacheUpdate.php
index
66ce9a3
..
b983e97
100644
(file)
--- a/
includes/deferred/CdnCacheUpdate.php
+++ b/
includes/deferred/CdnCacheUpdate.php
@@
-24,12
+24,12
@@
use Wikimedia\Assert\Assert;
use MediaWiki\MediaWikiServices;
/**
use MediaWiki\MediaWikiServices;
/**
- * Handles purging
appropriate CDN URLs given a title (or titles)
+ * Handles purging
the appropriate CDN objects given a list of URLs or Title instances
* @ingroup Cache
*/
class CdnCacheUpdate implements DeferrableUpdate, MergeableUpdate {
/** @var string[] Collection of URLs to purge */
* @ingroup Cache
*/
class CdnCacheUpdate implements DeferrableUpdate, MergeableUpdate {
/** @var string[] Collection of URLs to purge */
- pr
otected
$urls = [];
+ pr
ivate
$urls = [];
/**
* @param string[] $urlArr Collection of URLs to purge
/**
* @param string[] $urlArr Collection of URLs to purge
@@
-39,8
+39,9
@@
class CdnCacheUpdate implements DeferrableUpdate, MergeableUpdate {
}
public function merge( MergeableUpdate $update ) {
}
public function merge( MergeableUpdate $update ) {
- /** @var
CdnCacheUpdate
$update */
+ /** @var
self
$update */
Assert::parameterType( __CLASS__, $update, '$update' );
Assert::parameterType( __CLASS__, $update, '$update' );
+ '@phan-var self $update';
$this->urls = array_merge( $this->urls, $update->urls );
}
$this->urls = array_merge( $this->urls, $update->urls );
}
@@
-98,10
+99,9
@@
class CdnCacheUpdate implements DeferrableUpdate, MergeableUpdate {
wfDebugLog( 'squid', __METHOD__ . ': ' . implode( ' ', $urlArr ) );
// Reliably broadcast the purge to all edge nodes
wfDebugLog( 'squid', __METHOD__ . ': ' . implode( ' ', $urlArr ) );
// Reliably broadcast the purge to all edge nodes
- $relayer = MediaWikiServices::getInstance()->getEventRelayerGroup()
- ->getRelayer( 'cdn-url-purges' );
$ts = microtime( true );
$ts = microtime( true );
- $relayer->notifyMulti(
+ $relayerGroup = MediaWikiServices::getInstance()->getEventRelayerGroup();
+ $relayerGroup->getRelayer( 'cdn-url-purges' )->notifyMulti(
'cdn-url-purges',
array_map(
function ( $url ) use ( $ts ) {
'cdn-url-purges',
array_map(
function ( $url ) use ( $ts ) {
@@
-137,7
+137,7
@@
class CdnCacheUpdate implements DeferrableUpdate, MergeableUpdate {
foreach ( $chunks as $chunk ) {
$client = new SquidPurgeClient( $server );
foreach ( $chunk as $url ) {
foreach ( $chunks as $chunk ) {
$client = new SquidPurgeClient( $server );
foreach ( $chunk as $url ) {
- $client->queuePurge(
$url
);
+ $client->queuePurge(
self::expand( $url )
);
}
$pool->addClient( $client );
}
}
$pool->addClient( $client );
}
@@
-254,7
+254,7
@@
class CdnCacheUpdate implements DeferrableUpdate, MergeableUpdate {
* @param string $url
* @return string
*/
* @param string $url
* @return string
*/
- p
ublic
static function expand( $url ) {
+ p
rivate
static function expand( $url ) {
return wfExpandUrl( $url, PROTO_INTERNAL );
}
return wfExpandUrl( $url, PROTO_INTERNAL );
}