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

Merge pull request #371 from lbryio/fix-settings

Browse source 
Fix settings
This commit is contained in:
Job Evers‐Meltzer 2017-01-01 11:24:25 -06:00 committed by GitHub
commit 2afc4c25a2
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lbrynet/lbrynet_daemon/Daemon.py
View file

@ -1235,7 +1235,9 @@ class Daemon(AuthJSONRPCServer):
""" """
log.info("Get daemon settings") log.info("Get daemon settings")
return self._render_response(conf.settings.get_dict(), OK_CODE) settings_dict = conf.settings.get_dict()
settings_dict['lbryid'] = binascii.hexlify(settings_dict['lbryid'])
return self._render_response(settings_dict, OK_CODE)
@AuthJSONRPCServer.auth_required @AuthJSONRPCServer.auth_required
def jsonrpc_set_settings(self, p): def jsonrpc_set_settings(self, p):

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

@ -312,8 +312,8 @@ class AuthJSONRPCServer(AuthorizedBase):
self._set_headers(request, encoded_message, auth_required) self._set_headers(request, encoded_message, auth_required)
self._render_message(request, encoded_message) self._render_message(request, encoded_message)
except Exception as err: except Exception as err:
msg = "Failed to render API response: %s" log.exception("Failed to render API response: %s", result)
self._log_and_render_error(err, request, message=msg, version=version) self._render_error(err, request, version)
def _render_response(self, result, code): def _render_response(self, result, code):
return defer.succeed({'result': result, 'code': code}) return defer.succeed({'result': result, 'code': code})