diff options
| author | Timo Tijhof <krinklemail@gmail.com> | 2015-11-02 21:45:43 +0000 |
|---|---|---|
| committer | Timo Tijhof <krinklemail@gmail.com> | 2015-11-02 22:16:05 +0000 |
| commit | 8a821011cee395a1dcc4b1164d3d45a38b0a3f7a (patch) | |
| tree | 5c1fcbda7a4e81df5ff094761d0d2d048720b9bc /includes/filebackend/lockmanager | |
| parent | 5f15ac0058b56e8782829170b4397b2bacfa8089 (diff) | |
| download | mediawikicore-8a821011cee395a1dcc4b1164d3d45a38b0a3f7a.tar.gz mediawikicore-8a821011cee395a1dcc4b1164d3d45a38b0a3f7a.zip | |
Remove getLocalServerInstance try/catch in UIDGenerator and DBLockManager
Follows-up 17c91ad610 in which the exception was removed.
Change-Id: If0c8465d0e04f69f29f3f2602dac7ae4538f7542
Diffstat (limited to 'includes/filebackend/lockmanager')
| -rw-r--r-- | includes/filebackend/lockmanager/DBLockManager.php | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/includes/filebackend/lockmanager/DBLockManager.php b/includes/filebackend/lockmanager/DBLockManager.php index 1c389c3c2974..42ebb46e6b63 100644 --- a/includes/filebackend/lockmanager/DBLockManager.php +++ b/includes/filebackend/lockmanager/DBLockManager.php @@ -95,12 +95,7 @@ abstract class DBLockManager extends QuorumLockManager { if ( count( $bucket ) > 1 ) { // multiple peers // Tracks peers that couldn't be queried recently to avoid lengthy // connection timeouts. This is useless if each bucket has one peer. - try { - $this->statusCache = ObjectCache::getLocalServerInstance(); - } catch ( Exception $e ) { - trigger_error( __CLASS__ . - " using multiple DB peers without apc, xcache, or wincache." ); - } + $this->statusCache = ObjectCache::getLocalServerInstance(); break; } } |