bridge (pb): fixed conversions of Failure to BridgeException in non-AIO bridge
This commit is contained in:
parent
e2d9c7db4a
commit
81de80348b
2 changed files with 216 additions and 133 deletions
|
|
@ -1,6 +1,5 @@
|
|||
#!/usr/bin/env python3
|
||||
|
||||
|
||||
# SàT: a XMPP client
|
||||
# Copyright (C) 2009-2020 Jérôme Poisson (goffi@goffi.org)
|
||||
|
||||
|
|
@ -39,8 +38,9 @@ class pbConstructor(base_constructor.Constructor):
|
|||
if callback is not None:
|
||||
d.addCallback({callback})
|
||||
if errback is None:
|
||||
errback = self._generic_errback
|
||||
d.addErrback(errback)\n""",
|
||||
d.addErrback(self._generic_errback)
|
||||
else:
|
||||
d.addErrback(self._errback, ori_errback=errback)\n""",
|
||||
"async_methods": """\
|
||||
def {name}(self{args_comma}{args}):
|
||||
{debug}d = self.root.callRemote("{name}"{args_comma}{args_no_def})
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
#!/usr/bin/env python3
|
||||
|
||||
|
||||
# SAT communication bridge
|
||||
# SàT communication bridge
|
||||
# Copyright (C) 2009-2020 Jérôme Poisson (goffi@goffi.org)
|
||||
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
|
|
@ -65,6 +64,15 @@ class Bridge(object):
|
|||
def _generic_errback(self, err):
|
||||
log.error(f"bridge error: {err}")
|
||||
|
||||
def _errback(self, failure_, ori_errback):
|
||||
"""Convert Failure to BridgeException"""
|
||||
ori_errback(
|
||||
BridgeException(
|
||||
name=failure_.type.decode('utf-8'),
|
||||
message=str(failure_.value)
|
||||
)
|
||||
)
|
||||
|
||||
def remoteCallback(self, result, callback):
|
||||
"""call callback with argument or None
|
||||
|
||||
|
|
@ -159,6 +167,7 @@ class AIOBridge(Bridge):
|
|||
self.signals_handler = AIOSignalsHandler()
|
||||
|
||||
def _errback(self, failure_):
|
||||
"""Convert Failure to BridgeException"""
|
||||
raise BridgeException(
|
||||
name=failure_.type.decode('utf-8'),
|
||||
message=str(failure_.value)
|
||||
|
|
|
|||
Loading…
Reference in a new issue