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

add message key to upload_log

Browse source 
log the message which is then uploaded with a special file prefix, and
also send the message to slack
This commit is contained in:
Jack 2016-04-20 23:50:13 -04:00
parent 561cdba7c9
commit 2c1ba623a4
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lbrynet/lbrynet_daemon/LBRYDaemon.py
View file

@ -989,6 +989,12 @@ class LBRYDaemon(jsonrpc.JSONRPC):
r.append(t) r.append(t)
return r return r
def _log_to_slack(self, msg):
URL = "https://hooks.slack.com/services/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"
msg = platform.platform() + ": " + base58.b58encode(self.lbryid)[:20] + ", " + msg
requests.post(URL, json.dumps({"text": msg}))
return defer.succeed(None)
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})
@ -1721,6 +1727,9 @@ class LBRYDaemon(jsonrpc.JSONRPC):
else: else:
exclude_previous = True exclude_previous = True
if 'message' in p.keys():
log.info("[" + str(datetime.now()) + "] Upload log message: " + str(p['message']))
if 'force' in p.keys(): if 'force' in p.keys():
force = p['force'] force = p['force']
else: else:
@ -1730,5 +1739,7 @@ class LBRYDaemon(jsonrpc.JSONRPC):
exclude_previous = True exclude_previous = True
d = self._upload_log(name_prefix=prefix, exclude_previous=exclude_previous, force=force) d = self._upload_log(name_prefix=prefix, exclude_previous=exclude_previous, force=force)
if 'message' in p.keys():
d.addCallback(lambda _: self._log_to_slack(p['message']))
d.addCallback(lambda _: self._render_response(True, OK_CODE)) d.addCallback(lambda _: self._render_response(True, OK_CODE))
return d return d

3
lbrynet/lbrynet_daemon/LBRYDaemonServer.py
View file

@ -83,9 +83,8 @@ class LBRYBugReport(resource.Resource):
def render_POST(self, request): def render_POST(self, request):
msg = request.args["message"][0] msg = request.args["message"][0]
log.info("User submitted error report: " + str(msg))
api = jsonrpc.Proxy(API_CONNECTION_STRING) api = jsonrpc.Proxy(API_CONNECTION_STRING)
d = api.callRemote("upload_log", {'name_prefix': 'report', 'exclude_previous': False, 'force': True}) d = api.callRemote("upload_log", {'name_prefix': 'report', 'exclude_previous': False, 'force': True, 'message': str(msg)})
d.addCallback(lambda _: self._delayed_render(request, "<html><body>Your bug report is greatly appreciated! <a href='lbry://lbry'>Click here to return to LBRY</a></body></html>")) d.addCallback(lambda _: self._delayed_render(request, "<html><body>Your bug report is greatly appreciated! <a href='lbry://lbry'>Click here to return to LBRY</a></body></html>"))
return server.NOT_DONE_YET return server.NOT_DONE_YET