Merge "object-expirer: refactor creating InternalClient"
This commit is contained in:
1 changed files with 11 additions and 10 deletions
@@ -174,8 +174,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()
@@ -193,21 +194,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()
Reference in New Issue
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.