Alexandros Kosiaris has submitted this change and it was merged.
Change subject: RESTBase: use the appropriate logger name
......................................................................
RESTBase: use the appropriate logger name
I8290033b875f61645ff59b99ad25cb29a62771b7 overrode the logging name in
the `logging` config stanza. However, there is a subtlety in
service-runner that allows services to override that name, since the
logic is that multiple services can be collocated inside the same
process. This resulted in staging still outputting logs to the
production logstash. This commit fixes that once and for all.
Bug: T103124
Change-Id: Ia692819ec92502d83b9a435dadb389ec39f81ae7
---
M modules/restbase/templates/config.labs.yaml.erb
M modules/restbase/templates/config.yaml.erb
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
Ppchelko: Looks good to me, but someone else must approve
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/restbase/templates/config.labs.yaml.erb
b/modules/restbase/templates/config.labs.yaml.erb
index 5191935..766b4ae 100644
--- a/modules/restbase/templates/config.labs.yaml.erb
+++ b/modules/restbase/templates/config.labs.yaml.erb
@@ -132,7 +132,7 @@
# The main service setup. Each worker can offer one or more services.
services:
- - name: restbase
+ - name: <%= @logging_name %>
module: hyperswitch
conf:
port: <%= @port %>
diff --git a/modules/restbase/templates/config.yaml.erb
b/modules/restbase/templates/config.yaml.erb
index ce1c1eb..d9007aa 100644
--- a/modules/restbase/templates/config.yaml.erb
+++ b/modules/restbase/templates/config.yaml.erb
@@ -887,7 +887,7 @@
# The main service setup. Each worker can offer one or more services.
services:
- - name: restbase
+ - name: <%= @logging_name %>
module: hyperswitch
conf:
port: <%= @port %>
--
To view, visit https://gerrit.wikimedia.org/r/290922
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia692819ec92502d83b9a435dadb389ec39f81ae7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mobrovac <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Eevans <[email protected]>
Gerrit-Reviewer: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Mobrovac <[email protected]>
Gerrit-Reviewer: Ppchelko <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
