[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Can't use undefined annotations from 3fdc1a37
jenkins-bot has submitted this change and it was merged.
Change subject: Can't use undefined annotations from 3fdc1a37
..
Can't use undefined annotations from 3fdc1a37
* Let's revert some of c507329e instead.
* scap is complaining,
20:08:51 deploy failed: could not determine a
constructor for the tag 'tag:yaml.org,2002:js/undefined'
in "", line 3, column 12:
api_proxy: !!js/undefined ''
it doesn't know about that syntax.
Change-Id: Iea9658f76ff26bfd227e73d1a7c52f40ee846b85
---
M conf/wmf/localsettings.js
M scap/environments/beta/vars.yaml
M scap/templates/config.yaml.j2
M scap/vars.yaml
4 files changed, 4 insertions(+), 6 deletions(-)
Approvals:
Arlolra: Looks good to me, approved
jenkins-bot: Verified
diff --git a/conf/wmf/localsettings.js b/conf/wmf/localsettings.js
index efb4cb2..1ea012d 100644
--- a/conf/wmf/localsettings.js
+++ b/conf/wmf/localsettings.js
@@ -1,5 +1,9 @@
"use strict";
exports.setup = function(parsoidConfig) {
+ // Use the API backends directly without hitting the text varnishes.
+ // API requests are not cacheable anyway.
+ parsoidConfig.defaultAPIProxyURI = 'http://api.svc.eqiad.wmnet';
+
// Sample these verbose logs to prevent overwhelm
// 1% and 2% for empty/tr and empty/li is based on
// seeing the volume in rt-testing.
diff --git a/scap/environments/beta/vars.yaml b/scap/environments/beta/vars.yaml
index d8df203..33a5a26 100644
--- a/scap/environments/beta/vars.yaml
+++ b/scap/environments/beta/vars.yaml
@@ -1,3 +1,2 @@
localsettings: conf/wmf/betalabs.localsettings.js
load_wmf: false
-api_proxy: !!js/undefined ''
diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2
index 0801609..5e36d4c 100644
--- a/scap/templates/config.yaml.j2
+++ b/scap/templates/config.yaml.j2
@@ -44,10 +44,6 @@
useBatchAPI: true
usePHPPreProcessor: true
- # Use the API backends directly without hitting the text varnishes.
- # API requests are not cacheable anyway.
- defaultAPIProxyURI: <%= api_proxy %>
-
# RESTBase uses 2 minutes timeouts for the first request
# and a higher value subsequently.
#
diff --git a/scap/vars.yaml b/scap/vars.yaml
index 10cfdaf..bb8bb0a 100644
--- a/scap/vars.yaml
+++ b/scap/vars.yaml
@@ -12,4 +12,3 @@
port: 8000
localsettings: conf/wmf/localsettings.js
load_wmf: true
-api_proxy: "http://api.svc.eqiad.wmnet;
--
To view, visit https://gerrit.wikimedia.org/r/324260
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iea9658f76ff26bfd227e73d1a7c52f40ee846b85
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/services/parsoid/deploy
Gerrit-Branch: master
Gerrit-Owner: Arlolra
Gerrit-Reviewer: Arlolra
Gerrit-Reviewer: Subramanya Sastry
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Can't use undefined annotations from 3fdc1a37
Arlolra has uploaded a new change for review.
https://gerrit.wikimedia.org/r/324260
Change subject: Can't use undefined annotations from 3fdc1a37
..
Can't use undefined annotations from 3fdc1a37
* Let's revert some of c507329e instead.
* scap is complaining,
20:08:51 deploy failed: could not determine a
constructor for the tag 'tag:yaml.org,2002:js/undefined'
in "", line 3, column 12:
api_proxy: !!js/undefined ''
it doesn't know about that syntax.
Change-Id: Iea9658f76ff26bfd227e73d1a7c52f40ee846b85
---
M conf/wmf/localsettings.js
M scap/environments/beta/vars.yaml
M scap/templates/config.yaml.j2
M scap/vars.yaml
4 files changed, 4 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid/deploy
refs/changes/60/324260/1
diff --git a/conf/wmf/localsettings.js b/conf/wmf/localsettings.js
index efb4cb2..5ab7c78 100644
--- a/conf/wmf/localsettings.js
+++ b/conf/wmf/localsettings.js
@@ -1,5 +1,9 @@
"use strict";
exports.setup = function(parsoidConfig) {
+ // Use the API backends directly without hitting the text varnishes.
+ // API requests are not cacheable anyway.
+ defaultAPIProxyURI = 'http://api.svc.eqiad.wmnet';
+
// Sample these verbose logs to prevent overwhelm
// 1% and 2% for empty/tr and empty/li is based on
// seeing the volume in rt-testing.
diff --git a/scap/environments/beta/vars.yaml b/scap/environments/beta/vars.yaml
index d8df203..33a5a26 100644
--- a/scap/environments/beta/vars.yaml
+++ b/scap/environments/beta/vars.yaml
@@ -1,3 +1,2 @@
localsettings: conf/wmf/betalabs.localsettings.js
load_wmf: false
-api_proxy: !!js/undefined ''
diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2
index 0801609..5e36d4c 100644
--- a/scap/templates/config.yaml.j2
+++ b/scap/templates/config.yaml.j2
@@ -44,10 +44,6 @@
useBatchAPI: true
usePHPPreProcessor: true
- # Use the API backends directly without hitting the text varnishes.
- # API requests are not cacheable anyway.
- defaultAPIProxyURI: <%= api_proxy %>
-
# RESTBase uses 2 minutes timeouts for the first request
# and a higher value subsequently.
#
diff --git a/scap/vars.yaml b/scap/vars.yaml
index 10cfdaf..bb8bb0a 100644
--- a/scap/vars.yaml
+++ b/scap/vars.yaml
@@ -12,4 +12,3 @@
port: 8000
localsettings: conf/wmf/localsettings.js
load_wmf: true
-api_proxy: "http://api.svc.eqiad.wmnet;
--
To view, visit https://gerrit.wikimedia.org/r/324260
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iea9658f76ff26bfd227e73d1a7c52f40ee846b85
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid/deploy
Gerrit-Branch: master
Gerrit-Owner: Arlolra
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
