Rename parsoid stash backend config var.
This changes the name of a key in the ParsoidCacheConfig array: StashType is more in line with other configuration variables that refer to on aobject cache type. This is not a breaking change since ParsoidCacheConfig was only introduced recently and is not in used in WMF config nor present in any release. This is a Follow-up to Ic67dc43ed9843810e4b180127f9a3bb7608f7608. Change-Id: I9e61a6f94ec8bf1716c7d735f9bb17af4461fc9c
This commit is contained in:
parent
e851b3d379
commit
842d181707
4 changed files with 7 additions and 7 deletions
|
|
@ -2383,13 +2383,13 @@ config-schema:
|
|||
ParsoidCacheConfig:
|
||||
type: object
|
||||
default:
|
||||
StashBackend: null
|
||||
StashType: null
|
||||
StashDuration: 86400
|
||||
CacheThresholdTime: 0.0
|
||||
description: |-
|
||||
Configuration for the caching related to parsoid output. The configuration contains the
|
||||
following keys:
|
||||
- StashBackend: The name of the object store to be used by the ParsoidOutputStash service,
|
||||
- StashType: The type of object store to be used by the ParsoidOutputStash service,
|
||||
which stores the base state of HTML based edits.
|
||||
Valid options are the keys of {@link $wgObjectCaches}, e.g. CACHE_* constants.
|
||||
Per default, the value of the MainStash setting will be used.
|
||||
|
|
|
|||
|
|
@ -3737,7 +3737,7 @@ class MainConfigSchema {
|
|||
* Configuration for the caching related to parsoid output. The configuration contains the
|
||||
* following keys:
|
||||
*
|
||||
* - StashBackend: The name of the object store to be used by the ParsoidOutputStash service,
|
||||
* - StashType: The type of object store to be used by the ParsoidOutputStash service,
|
||||
* which stores the base state of HTML based edits.
|
||||
* Valid options are the keys of {@link $wgObjectCaches}, e.g. CACHE_* constants.
|
||||
* Per default, the value of the MainStash setting will be used.
|
||||
|
|
@ -3761,7 +3761,7 @@ class MainConfigSchema {
|
|||
public const ParsoidCacheConfig = [
|
||||
'type' => 'object',
|
||||
'default' => [
|
||||
'StashBackend' => null,
|
||||
'StashType' => null,
|
||||
'StashDuration' => 24 * 60 * 60,
|
||||
'CacheThresholdTime' => 0.0
|
||||
]
|
||||
|
|
|
|||
|
|
@ -1327,8 +1327,8 @@ return [
|
|||
// TODO: Determine storage requirements and config options for stashing parsoid
|
||||
// output for VE edits (T309016).
|
||||
$config = $services->getMainConfig()->get( MainConfigNames::ParsoidCacheConfig );
|
||||
$backend = $config['StashBackend']
|
||||
? ObjectCache::getInstance( $config['StashBackend'] )
|
||||
$backend = $config['StashType']
|
||||
? ObjectCache::getInstance( $config['StashType'] )
|
||||
: $services->getMainObjectStash();
|
||||
|
||||
return new SimpleParsoidOutputStash( $backend, $config['StashDuration'] );
|
||||
|
|
|
|||
|
|
@ -504,7 +504,7 @@ return [
|
|||
'EnableWANCacheReaper' => false,
|
||||
'MainStash' => 'db-replicated',
|
||||
'ParsoidCacheConfig' => [
|
||||
'StashBackend' => null,
|
||||
'StashType' => null,
|
||||
'StashDuration' => 86400,
|
||||
'CacheThresholdTime' => 0.0,
|
||||
],
|
||||
|
|
|
|||
Loading…
Reference in a new issue