ca71e69fc6
Don't catch and discard exceptions from the RequestTimeout library, except when the exception is properly handled and the code seems to be trying to wrap things up. In most cases the exception is rethrown. Ideally it should instead be done by narrowing the catch, and this was feasible in a few cases. But sometimes the exception being caught is an instance of the base class (notably DateTime::__construct()). Often Exception is the root of the hierarchy of exceptions being thrown and so is the obvious catch-all. Notes on specific callers: * In the case of ResourceLoader::respond(), exceptions were caught for API correctness, but processing continued. I added an outer try block for timeout handling so that termination would be more prompt. * In LCStoreCDB the Exception being caught was Cdb\Exception not \Exception. I added an alias to avoid confusion. * In ImageGallery I added a special exception class. * In Message::__toString() the rationale for catching disappears in PHP 7.4.0+, so I added a PHP version check. * In PoolCounterRedis, let the shutdown function do its thing, but rethrow the exception for logging. Change-Id: I4c3770b9efc76a1ce42ed9f59329c36de04d657c
134 lines
3.7 KiB
PHP
134 lines
3.7 KiB
PHP
<?php
|
|
/**
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along
|
|
* with this program; if not, write to the Free Software Foundation, Inc.,
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
* http://www.gnu.org/copyleft/gpl.html
|
|
*
|
|
* @file
|
|
*/
|
|
use Cdb\Exception as CdbException;
|
|
use Cdb\Reader;
|
|
use Cdb\Writer;
|
|
|
|
/**
|
|
* LCStore implementation which stores data as a collection of CDB files.
|
|
*
|
|
* Profiling indicates that on Linux, this implementation outperforms MySQL if
|
|
* the directory is on a local filesystem and there is ample kernel cache
|
|
* space. The performance advantage is greater when the DBA extension is
|
|
* available than it is with the PHP port.
|
|
*
|
|
* See Cdb.php and https://cr.yp.to/cdb.html
|
|
*/
|
|
class LCStoreCDB implements LCStore {
|
|
|
|
/** @var Reader[]|false[] */
|
|
private $readers;
|
|
|
|
/** @var Writer|null */
|
|
private $writer;
|
|
|
|
/** @var string Current language code */
|
|
private $currentLang;
|
|
|
|
/** @var string Cache directory */
|
|
private $directory;
|
|
|
|
public function __construct( $conf = [] ) {
|
|
$this->directory = $conf['directory'];
|
|
}
|
|
|
|
public function get( $code, $key ) {
|
|
if ( !isset( $this->readers[$code] ) ) {
|
|
$fileName = $this->getFileName( $code );
|
|
|
|
$this->readers[$code] = false;
|
|
if ( is_file( $fileName ) ) {
|
|
try {
|
|
$this->readers[$code] = Reader::open( $fileName );
|
|
} catch ( CdbException $e ) {
|
|
wfDebug( __METHOD__ . ": unable to open cdb file for reading" );
|
|
}
|
|
}
|
|
}
|
|
|
|
if ( !$this->readers[$code] ) {
|
|
return null;
|
|
} else {
|
|
$value = false;
|
|
try {
|
|
$value = $this->readers[$code]->get( $key );
|
|
} catch ( CdbException $e ) {
|
|
wfDebug( __METHOD__ . ": \Cdb\Exception caught, error message was "
|
|
. $e->getMessage() );
|
|
}
|
|
if ( $value === false ) {
|
|
return null;
|
|
}
|
|
|
|
return unserialize( $value );
|
|
}
|
|
}
|
|
|
|
public function startWrite( $code ) {
|
|
if ( !is_dir( $this->directory ) && !wfMkdirParents( $this->directory, null, __METHOD__ ) ) {
|
|
throw new MWException( "Unable to create the localisation store " .
|
|
"directory \"{$this->directory}\"" );
|
|
}
|
|
|
|
// Close reader to stop permission errors on write
|
|
if ( !empty( $this->readers[$code] ) ) {
|
|
$this->readers[$code]->close();
|
|
}
|
|
|
|
try {
|
|
$this->writer = Writer::open( $this->getFileName( $code ) );
|
|
} catch ( CdbException $e ) {
|
|
throw new MWException( $e->getMessage() );
|
|
}
|
|
$this->currentLang = $code;
|
|
}
|
|
|
|
public function finishWrite() {
|
|
// Close the writer
|
|
try {
|
|
$this->writer->close();
|
|
} catch ( CdbException $e ) {
|
|
throw new MWException( $e->getMessage() );
|
|
}
|
|
$this->writer = null;
|
|
unset( $this->readers[$this->currentLang] );
|
|
$this->currentLang = null;
|
|
}
|
|
|
|
public function set( $key, $value ) {
|
|
if ( $this->writer === null ) {
|
|
throw new MWException( __CLASS__ . ': must call startWrite() before calling set()' );
|
|
}
|
|
try {
|
|
$this->writer->set( $key, serialize( $value ) );
|
|
} catch ( CdbException $e ) {
|
|
throw new MWException( $e->getMessage() );
|
|
}
|
|
}
|
|
|
|
protected function getFileName( $code ) {
|
|
if ( strval( $code ) === '' || strpos( $code, '/' ) !== false ) {
|
|
throw new MWException( __METHOD__ . ": Invalid language \"$code\"" );
|
|
}
|
|
|
|
return "{$this->directory}/l10n_cache-$code.cdb";
|
|
}
|
|
|
|
}
|