Skip to content

Commit a0d340e

Browse files
committed
Move error details scope up one-level.
Signed-off-by: Jesse Whitehouse <[email protected]>
1 parent bf65b81 commit a0d340e

File tree

1 file changed

+12
-9
lines changed

1 file changed

+12
-9
lines changed

src/databricks/sql/thrift_backend.py

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -284,24 +284,27 @@ def attempt_request(attempt):
284284
# - non-None method_return -> success, return and be done
285285
# - non-None retry_delay -> sleep delay before retry
286286
# - error, error_message always set when available
287+
288+
error, error_message, retry_delay = None, None, None
287289
try:
288290
logger.debug("Sending request: {}".format(request))
289291
response = method(request)
290292
logger.debug("Received response: {}".format(response))
291293
return response
292-
except Exception as error:
294+
except Exception as err:
295+
error = err
293296
retry_delay = extract_retry_delay(attempt)
294297
error_message = ThriftBackend._extract_error_message_from_headers(
295298
getattr(self._transport, "headers", {})
296299
)
297-
return RequestErrorInfo(
298-
error=error,
299-
error_message=error_message,
300-
retry_delay=retry_delay,
301-
http_code=getattr(self._transport, "code", None),
302-
method=method.__name__,
303-
request=request,
304-
)
300+
return RequestErrorInfo(
301+
error=error,
302+
error_message=error_message,
303+
retry_delay=retry_delay,
304+
http_code=getattr(self._transport, "code", None),
305+
method=method.__name__,
306+
request=request,
307+
)
305308

306309
# The real work:
307310
# - for each available attempt:

0 commit comments

Comments
 (0)