Arlolra has uploaded a new change for review.
https://gerrit.wikimedia.org/r/206477
Change subject: Don't store the uri on parsoid config
......................................................................
Don't store the uri on parsoid config
* Setting yourself up for race conditions.
* This was causing major corruption on wiki.
* Consider freezing parsoid config in a follow up.
Change-Id: Ia2244b9737fee1563ca3a33ba3b8683862b39d24
---
M lib/mediawiki.parser.environment.js
1 file changed, 3 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/77/206477/1
diff --git a/lib/mediawiki.parser.environment.js
b/lib/mediawiki.parser.environment.js
index c3598a5..206a0a0 100644
--- a/lib/mediawiki.parser.environment.js
+++ b/lib/mediawiki.parser.environment.js
@@ -278,11 +278,11 @@
var nothingToDo = {}; // unique marker value
var parsoid = env.conf.parsoid;
- var getConfigPromise;
+ var getConfigPromise, uri;
if (!prefix) {
getConfigPromise = Promise.reject(new Error('Wiki prefix not
provided'));
} else {
- var uri = parsoid.interwikiMap.get(prefix);
+ uri = parsoid.interwikiMap.get(prefix);
if (!uri) {
// SSS: Ugh! Looks like parser tests use a prefix
// that is not part of the interwikiMap -- so we
@@ -294,7 +294,6 @@
prefix + '; defaulting to enwiki');
uri = parsoid.interwikiMap.get('enwiki');
}
- parsoid.apiURI = uri;
if (env.confCache[prefix]) {
env.conf.wiki = env.confCache[prefix];
@@ -318,7 +317,7 @@
return getConfigPromise.then(function(resultConf) {
if (resultConf === nothingToDo) { return; }
- env.conf.wiki = new WikiConfig(env, resultConf, prefix,
parsoid.apiURI,
+ env.conf.wiki = new WikiConfig(env, resultConf, prefix, uri,
env.getAPIProxy(prefix));
env.confCache[prefix] = env.conf.wiki;
}).nodify(cb);
--
To view, visit https://gerrit.wikimedia.org/r/206477
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia2244b9737fee1563ca3a33ba3b8683862b39d24
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
