Merge "Don't add exception in msg when using LOG.exception"
This commit is contained in:
commit
107e40bb5f
|
@ -120,8 +120,8 @@ class KeystoneClientV3(object):
|
||||||
trustee_user=trustee_user,
|
trustee_user=trustee_user,
|
||||||
impersonation=impersonation,
|
impersonation=impersonation,
|
||||||
role_names=role_names)
|
role_names=role_names)
|
||||||
except Exception as e:
|
except Exception:
|
||||||
LOG.exception(str(e))
|
LOG.exception(_LE('Failed to create trust'))
|
||||||
raise exception.TrustCreateFailed(
|
raise exception.TrustCreateFailed(
|
||||||
trustee_user_id=trustee_user)
|
trustee_user_id=trustee_user)
|
||||||
return trust
|
return trust
|
||||||
|
@ -137,6 +137,6 @@ class KeystoneClientV3(object):
|
||||||
self.client.trusts.delete(trust_id)
|
self.client.trusts.delete(trust_id)
|
||||||
except kc_exception.NotFound:
|
except kc_exception.NotFound:
|
||||||
pass
|
pass
|
||||||
except Exception as e:
|
except Exception:
|
||||||
LOG.exception(str(e))
|
LOG.exception(_LE('Failed to delete trust'))
|
||||||
raise exception.TrustDeleteFailed(trust_id=trust_id)
|
raise exception.TrustDeleteFailed(trust_id=trust_id)
|
||||||
|
|
|
@ -37,9 +37,7 @@ def wrap_container_exception(f):
|
||||||
container_uuid = kwargs.get('container').uuid
|
container_uuid = kwargs.get('container').uuid
|
||||||
|
|
||||||
LOG.exception(_LE("Error while connect to docker "
|
LOG.exception(_LE("Error while connect to docker "
|
||||||
"container %(name)s: %(error)s"),
|
"container %s"), container_uuid)
|
||||||
{'name': container_uuid,
|
|
||||||
'error': str(e)})
|
|
||||||
raise exception.ContainerException(
|
raise exception.ContainerException(
|
||||||
"Docker internal Error: %s" % str(e))
|
"Docker internal Error: %s" % str(e))
|
||||||
return functools.wraps(f)(wrapped)
|
return functools.wraps(f)(wrapped)
|
||||||
|
|
Loading…
Reference in New Issue