openstack/swift
Code Issues Proposed changes

Merge "py3: fix swift-account-audit"

Browse Source
This commit is contained in:
Zuul 2019-10-15 20:01:24 +00:00 committed by Gerrit Code Review
commit 294472464a
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bin/swift-account-audit
View File

@ -177,7 +177,8 @@ class Auditor(object):
(path, node['ip'], node['device'])) (path, node['ip'], node['device']))
break break
if node['id'] not in responses: if node['id'] not in responses:
responses[node['id']] = dict(resp.getheaders()) responses[node['id']] = {
h.lower(): v for h, v in resp.getheaders()}
results = json.loads(resp.read()) results = json.loads(resp.read())
except Exception: except Exception:
self.container_exceptions += 1 self.container_exceptions += 1
@ -262,7 +263,8 @@ class Auditor(object):
(account, node['ip'], node['device'])) (account, node['ip'], node['device']))
break break
if node_id not in responses: if node_id not in responses:
responses[node_id] = [dict(resp.getheaders()), []] responses[node_id] = [
{h.lower(): v for h, v in resp.getheaders()}, []]
responses[node_id][1].extend(results) responses[node_id][1].extend(results)
if results: if results:
marker = results[-1]['name'] marker = results[-1]['name']