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
Added a separate error message for mkdir failures
[lhc/web/wiklou.git]
/
includes
/
db
/
loadbalancer
/
LBFactorySimple.php
diff --git
a/includes/db/loadbalancer/LBFactorySimple.php
b/includes/db/loadbalancer/LBFactorySimple.php
index
1c9e094
..
53b0310
100644
(file)
--- a/
includes/db/loadbalancer/LBFactorySimple.php
+++ b/
includes/db/loadbalancer/LBFactorySimple.php
@@
-87,7
+87,8
@@
class LBFactorySimple extends LBFactory {
return new LoadBalancer( array(
'servers' => $servers,
'loadMonitor' => $this->loadMonitorClass,
return new LoadBalancer( array(
'servers' => $servers,
'loadMonitor' => $this->loadMonitorClass,
- 'readOnlyReason' => $this->readOnlyReason
+ 'readOnlyReason' => $this->readOnlyReason,
+ 'trxProfiler' => $this->trxProfiler
) );
}
) );
}
@@
-120,7
+121,8
@@
class LBFactorySimple extends LBFactory {
return new LoadBalancer( array(
'servers' => $wgExternalServers[$cluster],
'loadMonitor' => $this->loadMonitorClass,
return new LoadBalancer( array(
'servers' => $wgExternalServers[$cluster],
'loadMonitor' => $this->loadMonitorClass,
- 'readOnlyReason' => $this->readOnlyReason
+ 'readOnlyReason' => $this->readOnlyReason,
+ 'trxProfiler' => $this->trxProfiler
) );
}
) );
}
@@
-160,6
+162,6
@@
class LBFactorySimple extends LBFactory {
if ( !( $flags & self::SHUTDOWN_NO_CHRONPROT ) ) {
$this->shutdownChronologyProtector( $this->chronProt );
}
if ( !( $flags & self::SHUTDOWN_NO_CHRONPROT ) ) {
$this->shutdownChronologyProtector( $this->chronProt );
}
- $this->commitMasterChanges(); // sanity
+ $this->commitMasterChanges(
__METHOD__
); // sanity
}
}
}
}