Log context cancellation using `.cancel()` loglevel
parent
c9eb466d76
commit
a71a958f54
|
@ -444,19 +444,24 @@ class Context:
|
||||||
# (currently) that other portal APIs (``Portal.run()``,
|
# (currently) that other portal APIs (``Portal.run()``,
|
||||||
# ``.run_in_actor()``) do their own error checking at the point
|
# ``.run_in_actor()``) do their own error checking at the point
|
||||||
# of the call and result processing.
|
# of the call and result processing.
|
||||||
log.error(
|
|
||||||
f'Remote context error for {self.chan.uid}:{self.cid}:\n'
|
|
||||||
f'{msg["error"]["tb_str"]}'
|
|
||||||
)
|
|
||||||
error = unpack_error(msg, self.chan)
|
error = unpack_error(msg, self.chan)
|
||||||
if (
|
if (
|
||||||
isinstance(error, ContextCancelled) and
|
isinstance(error, ContextCancelled)
|
||||||
self._cancel_called
|
|
||||||
):
|
):
|
||||||
# this is an expected cancel request response message
|
log.cancel(
|
||||||
# and we don't need to raise it in scope since it will
|
f'Remote context error for {self.chan.uid}:{self.cid}:\n'
|
||||||
# potentially override a real error
|
f'{msg["error"]["tb_str"]}'
|
||||||
return
|
)
|
||||||
|
if self._cancel_called:
|
||||||
|
# this is an expected cancel request response message
|
||||||
|
# and we don't need to raise it in scope since it will
|
||||||
|
# potentially override a real error
|
||||||
|
return
|
||||||
|
else:
|
||||||
|
log.error(
|
||||||
|
f'Remote context error for {self.chan.uid}:{self.cid}:\n'
|
||||||
|
f'{msg["error"]["tb_str"]}'
|
||||||
|
)
|
||||||
|
|
||||||
self._error = error
|
self._error = error
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue