summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorAlistair Coles <alistairncoles@gmail.com>2021-12-06 15:35:41 +0000
committerAlistair Coles <alistairncoles@gmail.com>2022-01-12 11:07:25 +0000
commit035d91dce5dfc2fdaf842e9fbeb36684bceab278 (patch)
treec2d5dd66dfd1cf5ca84f7e749b663957b27332d8 /etc
parent5079d8429d9799e291d098e14487034c7e910a0d (diff)
downloadswift-035d91dce5dfc2fdaf842e9fbeb36684bceab278.tar.gz
Modify log_name in internal clients' pipeline configs
Modify the 'log_name' option in the InternalClient wsgi config for the following services: container-sharder, container-reconciler, container-deleter, container-sync and object-expirer. Previously the 'log_name' value for all internal client instances sharing a single internal-client.conf file took the value configured in the conf file, or would default to 'swift'. This resulted in no distinction between logs from each internal client, and no association with the service using a particular internal client. With this change the 'log_name' value will typically be <log_route>-ic where <log_route> is the service's conf file section name. For example, 'container-sharder-ic'. Note: any 'log_name' value configured in an internal client conf file will now be ignored for these services unless the option key is preceded by 'set'. Note: by default, the logger's StatdsClient uses the log_name as its tail_prefix when composing metrics' names. However, the proxy-logging middleware overrides the tail_prefix with the hard-coded value 'proxy-server'. This change to log_name therefore does not change the statsd metric names emitted by the internal client's proxy-logging. This patch does not change the logging of the services themselves, just their internal clients. Change-Id: I844381fb9e1f3462043d27eb93e3fa188b206d05 Related-Change: Ida39ec7eb02a93cf4b2aa68fc07b7f0ae27b5439
Diffstat (limited to 'etc')
-rw-r--r--etc/internal-client.conf-sample4
1 files changed, 3 insertions, 1 deletions
diff --git a/etc/internal-client.conf-sample b/etc/internal-client.conf-sample
index a3be2eaa4..7ded5fd8a 100644
--- a/etc/internal-client.conf-sample
+++ b/etc/internal-client.conf-sample
@@ -2,7 +2,9 @@
# swift_dir = /etc/swift
# user = swift
# You can specify default log routing here if you want:
-# log_name = swift
+# Note: the 'set' syntax is necessary to override the log_name that some
+# daemons specify when instantiating an internal client.
+# set log_name = swift
# log_facility = LOG_LOCAL0
# log_level = INFO
# log_address = /dev/log