KartikMistry has uploaded a new change for review.
https://gerrit.wikimedia.org/r/250910
Change subject: WIP: service-runner migration for cxserver
......................................................................
WIP: service-runner migration for cxserver
Not reviewable yet.
Change-Id: I72f84ec489686cd38f22dbfc150ec12f1d8dcf87
---
M modules/cxserver/templates/config.erb
1 file changed, 42 insertions(+), 39 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/10/250910/1
diff --git a/modules/cxserver/templates/config.erb
b/modules/cxserver/templates/config.erb
index ae6e428..3fa95d5 100644
--- a/modules/cxserver/templates/config.erb
+++ b/modules/cxserver/templates/config.erb
@@ -2,46 +2,49 @@
* THIS FILE IS MANAGED BY PUPPET
*/
-'use strict';
+num_workers: ncpu
-module.exports = {
- port: <%= @port %>,
- <%- if @proxy -%>
- proxy: '<%= @proxy %>',
+worker_heap_limit_mb: 500
+
+logging:
+ level: warn
+ steams:
+ <%- if @logstash_host %>
+ type: 'gelf',
+ host: '<%= @logstash_host %>',
+ port: <%= @logstash_port %>,
+ level: 'warn'
<%- end -%>
- logDir: '<%= @log_dir %>',
- logging: {
- name: 'cxserver',
- streams: [
- <%- if @logstash_host %>
- {
- type: 'gelf',
- host: '<%= @logstash_host %>',
- port: <%= @logstash_port %>,
- level: 'warn'
- },
- <%- end -%>
- {
- type: 'file',
- level: 'info',
- path: '<%= @log_file %>'
- }
- ]
- },
- 'parsoid.api': '<%= @parsoid %>',
- 'restbase.url': '<%= @restbase %>',
- 'mt.apertium.api': '<%= @apertium %>',
- <%- if @jwt_secret -%>
- jwt: {
+ type: 'file',
+ level: 'info',
+ path: '<%= @log_file %>'
+
+metrics:
+ type: statsd,
+ host: statsd.eqiad.wmnet,
+ port: 8125
+
+services:
+ name: 'cxserver',
+ module: ./app.js,
+ config:
+ port: 6927,
+ cors: '*',
+ 'restbase.url': '<%= @restbase %>',
+ <%- if @jwt_secret -%>
+ jwt: {
secret: '<%= @jwt_secret %>',
algorithms: [ 'HS256' ]
- },
- <%- end -%>
- <%- if @yandex_url -%>
- 'mt.yandex.api': '<%= @yandex_url %>',
- 'mt.yandex.key': '<%= @yandex_api_key %>',
- <%- end -%>
- <%- if @ordered_registry %>
- registry: <%= @ordered_registry %>
- <%- end -%>
-};
+ },
+ <%- end -%>
+ mt:
+ apertium:
+ api: '<%= @apertium %>',
+ <%- if @yandex_url -%>
+ yandex:
+ api: '<%= @yandex_url %>',
+ key: '<%= @yandex_api_key %>'
+ <%- end -%>
+ <%- if @ordered_registry %>
+ registry: <%= @ordered_registry %>
+ <%- end -%>
--
To view, visit https://gerrit.wikimedia.org/r/250910
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I72f84ec489686cd38f22dbfc150ec12f1d8dcf87
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: KartikMistry <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
