summaryrefslogtreecommitdiff
path: root/swiftclient/shell.py
diff options
context:
space:
mode:
authorTim Burke <tim.burke@gmail.com>2020-08-14 10:41:15 -0700
committerTim Burke <tim.burke@gmail.com>2020-09-09 15:32:43 -0700
commit0f6713ed5b8cdcf5cbc0850dea224b41d90e63f4 (patch)
tree80f8b277aa2b91a4606e9d7b30d7f1742361b182 /swiftclient/shell.py
parent9d8db8f6126542dc18ea1b14e078d64cc1a254e4 (diff)
downloadpython-swiftclient-0f6713ed5b8cdcf5cbc0850dea224b41d90e63f4.tar.gz
Include transaction ID in ClientException.__str__
It's fairly annoying getting a traceback in swift's probe tests then only having a URL and status code to go searching for in logs. Leave the shell.py output untouched, though, since we output the transaction ID on a new line anyway. Change-Id: Idb849848ec08b6c04812b088467c9a687c2a7e27
Diffstat (limited to 'swiftclient/shell.py')
-rwxr-xr-xswiftclient/shell.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/swiftclient/shell.py b/swiftclient/shell.py
index b129d63..dbcd437 100755
--- a/swiftclient/shell.py
+++ b/swiftclient/shell.py
@@ -2058,8 +2058,9 @@ Examples:
try:
globals()['st_%s' % args[0]](parser, argv[1:], output)
except ClientException as err:
+ trans_id = err.transaction_id
+ err.transaction_id = None # clear it so we aren't overly noisy
output.error(str(err))
- trans_id = (err.http_response_headers or {}).get('X-Trans-Id')
if trans_id:
output.error("Failed Transaction ID: %s",
parse_header_string(trans_id))