From 2422a77a4ae33c00e3b6b460d91c2c0c681fdae6 Mon Sep 17 00:00:00 2001 From: Alistair Coles Date: 2024年5月17日 15:05:34 +0100 Subject: [PATCH] object-expirer: refactor creating InternalClient read_conf_for_queue_access was mostly creating an InternalClient, so make that more explicit. Change-Id: Ia6e1e6a8b58a8476fa16a3c7d45e620c6d7f88e4 --- swift/obj/expirer.py | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/swift/obj/expirer.py b/swift/obj/expirer.py index 122ee80cf5..23d53e453d 100644 --- a/swift/obj/expirer.py +++ b/swift/obj/expirer.py @@ -140,8 +140,9 @@ class ObjectExpirer(Daemon): self.ic_conf_path = \ self.conf.get('internal_client_conf_path') or \ '/etc/swift/internal-client.conf' + self.swift = swift or self._make_internal_client(is_legacy_conf) - self.read_conf_for_queue_access(swift) + self.read_conf_for_queue_access() self.report_interval = float(conf.get('report_interval') or 300) self.report_first_time = self.report_last_time = time() @@ -159,21 +160,21 @@ class ObjectExpirer(Daemon): self.delay_reaping_times = read_conf_for_delay_reaping_times(conf) - def read_conf_for_queue_access(self, swift): + def _make_internal_client(self, is_legacy_conf): + request_tries = int(self.conf.get('request_tries') or 3) + return InternalClient( + self.ic_conf_path, 'Swift Object Expirer', request_tries, + use_replication_network=True, + global_conf={'log_name': '%s-ic' % self.conf.get( + 'log_name', self.log_route)}) + + def read_conf_for_queue_access(self): self.expiring_objects_account = AUTO_CREATE_ACCOUNT_PREFIX + \ (self.conf.get('expiring_objects_account_name') or 'expiring_objects') # This is for common parameter with general task queue in future self.task_container_prefix = '' - - 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, - global_conf={'log_name': '%s-ic' % self.conf.get( - 'log_name', self.log_route)}) - self.processes = non_negative_int(self.conf.get('processes', 0)) self.process = non_negative_int(self.conf.get('process', 0)) self._validate_processes_config()

AltStyle によって変換されたページ (->オリジナル) /