Merge "Remove explicit global_request_id from keystoneauth subclass"
This commit is contained in:
commit
3e1c4cc736
|
@ -126,12 +126,10 @@ def _log_request_id(logger, resp, service_name):
|
||||||
|
|
||||||
|
|
||||||
class SessionClient(adapter.LegacyJsonAdapter):
|
class SessionClient(adapter.LegacyJsonAdapter):
|
||||||
global_request_id = None
|
|
||||||
|
|
||||||
def __init__(self, *args, **kwargs):
|
def __init__(self, *args, **kwargs):
|
||||||
self.api_version = kwargs.pop('api_version', None)
|
self.api_version = kwargs.pop('api_version', None)
|
||||||
self.api_version = self.api_version or api_versions.APIVersion()
|
self.api_version = self.api_version or api_versions.APIVersion()
|
||||||
self.global_request_id = kwargs.pop('global_request_id', None)
|
|
||||||
self.retries = kwargs.pop('retries', 0)
|
self.retries = kwargs.pop('retries', 0)
|
||||||
self._logger = logging.getLogger(__name__)
|
self._logger = logging.getLogger(__name__)
|
||||||
super(SessionClient, self).__init__(*args, **kwargs)
|
super(SessionClient, self).__init__(*args, **kwargs)
|
||||||
|
@ -141,9 +139,6 @@ class SessionClient(adapter.LegacyJsonAdapter):
|
||||||
api_versions.update_headers(kwargs["headers"], self.api_version)
|
api_versions.update_headers(kwargs["headers"], self.api_version)
|
||||||
kwargs.setdefault('authenticated', False)
|
kwargs.setdefault('authenticated', False)
|
||||||
|
|
||||||
if self.global_request_id:
|
|
||||||
kwargs['headers'].setdefault(REQ_ID_HEADER, self.global_request_id)
|
|
||||||
|
|
||||||
# Note(tpatil): The standard call raises errors from
|
# Note(tpatil): The standard call raises errors from
|
||||||
# keystoneauth, here we need to raise the cinderclient errors.
|
# keystoneauth, here we need to raise the cinderclient errors.
|
||||||
raise_exc = kwargs.pop('raise_exc', True)
|
raise_exc = kwargs.pop('raise_exc', True)
|
||||||
|
|
Loading…
Reference in New Issue