diff options
| author | Zuul <zuul@review.opendev.org> | 2022-01-26 12:32:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-01-26 12:32:43 +0000 |
| commit | 46069110102a215955b45b40713b12eabbfc1840 (patch) | |
| tree | 5e2058bfa12592354da3dbf4c0d816dcf4afe7aa /swift/obj | |
| parent | 793a57d7f96c56c9639a0f5df19ca9ce2fd8e555 (diff) | |
| parent | 035d91dce5dfc2fdaf842e9fbeb36684bceab278 (diff) | |
| download | swift-46069110102a215955b45b40713b12eabbfc1840.tar.gz | |
Merge "Modify log_name in internal clients' pipeline configs"
Diffstat (limited to 'swift/obj')
| -rw-r--r-- | swift/obj/expirer.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/swift/obj/expirer.py b/swift/obj/expirer.py index 772b36793..ec53407aa 100644 --- a/swift/obj/expirer.py +++ b/swift/obj/expirer.py @@ -73,10 +73,11 @@ class ObjectExpirer(Daemon): :param conf: The daemon configuration. """ + log_route = 'object-expirer' def __init__(self, conf, logger=None, swift=None): self.conf = conf - self.logger = logger or get_logger(conf, log_route='object-expirer') + self.logger = logger or get_logger(conf, log_route=self.log_route) self.interval = float(conf.get('interval') or 300) self.tasks_per_second = float(conf.get('tasks_per_second', 50.0)) @@ -135,7 +136,9 @@ class ObjectExpirer(Daemon): request_tries = int(self.conf.get('request_tries') or 3) self.swift = swift or InternalClient( self.ic_conf_path, 'Swift Object Expirer', request_tries, - use_replication_network=True) + use_replication_network=True, + global_conf={'log_name': '%s-ic' % self.conf.get( + 'log_name', self.log_route)}) self.processes = int(self.conf.get('processes', 0)) self.process = int(self.conf.get('process', 0)) |