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 editing own JSON to editmyoptions grant"
[lhc/web/wiklou.git]
/
includes
/
libs
/
objectcache
/
BagOStuff.php
diff --git
a/includes/libs/objectcache/BagOStuff.php
b/includes/libs/objectcache/BagOStuff.php
index
c6bcc7a
..
a7ef3d5
100644
(file)
--- a/
includes/libs/objectcache/BagOStuff.php
+++ b/
includes/libs/objectcache/BagOStuff.php
@@
-64,7
+64,7
@@
abstract class BagOStuff implements IExpiringStore, LoggerAwareInterface {
protected $keyspace = 'local';
/** @var LoggerInterface */
protected $logger;
protected $keyspace = 'local';
/** @var LoggerInterface */
protected $logger;
- /** @var call
back
|null */
+ /** @var call
able
|null */
protected $asyncHandler;
/** @var int Seconds */
protected $syncTimeout;
protected $asyncHandler;
/** @var int Seconds */
protected $syncTimeout;
@@
-462,7
+462,7
@@
abstract class BagOStuff implements IExpiringStore, LoggerAwareInterface {
$fname = __METHOD__;
$expiry = min( $expiry ?: INF, self::TTL_DAY );
$loop = new WaitConditionLoop(
$fname = __METHOD__;
$expiry = min( $expiry ?: INF, self::TTL_DAY );
$loop = new WaitConditionLoop(
- function () use ( $key, $
timeout, $
expiry, $fname ) {
+ function () use ( $key, $expiry, $fname ) {
$this->clearLastError();
if ( $this->add( "{$key}:lock", 1, $expiry ) ) {
return true; // locked!
$this->clearLastError();
if ( $this->add( "{$key}:lock", 1, $expiry ) ) {
return true; // locked!