LBRYCommunity/lbry-sdk
1
0
Fork 1
Code Issues Pull requests Projects Releases 282 Packages Wiki Activity

Merge pull request #421 from lbryio/add-back-id

Browse source 
Add back id
This commit is contained in:
Job Evers‐Meltzer 2017-01-17 22:06:56 -06:00 committed by GitHub
commit 40b6476cf7
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lbrynet/core/log_support.py
View file

@ -399,7 +399,16 @@ class Logger(logging.Logger):
self.name, level, fn, lno, msg, msg_args, exc_info, func, msg_kwargs) self.name, level, fn, lno, msg, msg_args, exc_info, func, msg_kwargs)
self.handle(record) self.handle(record)
if callback: if callback:
try:
return callback(err, *args, **kwargs) return callback(err, *args, **kwargs)
except Exception:
# log.fail is almost always called within an
# errback. If callback fails and we didn't catch
# the exception we would need to attach a second
# errback to deal with that, which we will almost
# never do and then we end up with an unhandled
# error that will get swallowed by twisted
self.exception('Failed to run callback')
return _fail return _fail
def trace(self, msg, *args, **kwargs): def trace(self, msg, *args, **kwargs):

2
lbrynet/lbrynet_daemon/auth/server.py
View file

@ -211,7 +211,7 @@ class AuthJSONRPCServer(AuthorizedBase):
# handle deferredLists that won't peacefully cancel, namely # handle deferredLists that won't peacefully cancel, namely
# get_lbry_files # get_lbry_files
d.addErrback(trap, ConnectionDone, ConnectionLost, defer.CancelledError, RuntimeError) d.addErrback(trap, ConnectionDone, ConnectionLost, defer.CancelledError, RuntimeError)
d.addErrback(log.fail(self._render_error, request, version=version), d.addErrback(log.fail(self._render_error, request, id_, version=version),
'Failed to process %s', function_name) 'Failed to process %s', function_name)
d.addBoth(lambda _: log.debug("%s took %f", d.addBoth(lambda _: log.debug("%s took %f",
function_name, function_name,