LBRYFoundation/lbry-sdk
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/lbry-sdk.git synced 2025-09-03 02:35:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/better_log_names' into add-tests-to-travis

Browse source
This commit is contained in:
Jack 2016-05-30 17:09:39 -04:00
commit 9f0f9e0928
1 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
lbrynet/lbrynet_daemon/LBRYDaemon.py
View file

@ -409,9 +409,9 @@ class LBRYDaemon(jsonrpc.JSONRPC):
# self.lbrynet_connection_checker.start(3600) # self.lbrynet_connection_checker.start(3600)
if self.first_run: if self.first_run:
d = self._upload_log(name_prefix="fr") d = self._upload_log(log_type="first_run")
else: else:
d = self._upload_log(exclude_previous=True, name_prefix="start") d = self._upload_log(exclude_previous=True, log_type="start")
if float(self.session.wallet.wallet_balance) == 0.0: if float(self.session.wallet.wallet_balance) == 0.0:
d.addCallback(lambda _: self._check_first_run()) d.addCallback(lambda _: self._check_first_run())
@ -617,12 +617,7 @@ class LBRYDaemon(jsonrpc.JSONRPC):
dl.addCallback(_set_query_handlers) dl.addCallback(_set_query_handlers)
return dl return dl
def _upload_log(self, name_prefix=None, exclude_previous=False, force=False): def _upload_log(self, log_type=None, exclude_previous=False, force=False):
if name_prefix:
name_prefix = name_prefix + "-" + platform.system()
else:
name_prefix = platform.system()
if self.upload_log or force: if self.upload_log or force:
LOG_URL = "https://lbry.io/log-upload" LOG_URL = "https://lbry.io/log-upload"
if exclude_previous: if exclude_previous:
@ -634,9 +629,13 @@ class LBRYDaemon(jsonrpc.JSONRPC):
f = open(self.log_file, "r") f = open(self.log_file, "r")
log_contents = f.read() log_contents = f.read()
f.close() f.close()
t = datetime.now() params = {
log_name = name_prefix + "-" + base58.b58encode(self.lbryid)[:20] + "-" + str(t.month) + "-" + str(t.day) + "-" + str(t.year) + "-" + str(t.hour) + "-" + str(t.minute) 'date': datetime.utcnow().strftime('%Y%m%d-%H%M%S'),
params = {'name': log_name, 'log': log_contents} 'hash': base58.b58encode(self.lbryid)[:20],
'sys': platform.system(),
'type': log_type,
'log': log_contents
}
requests.post(LOG_URL, params) requests.post(LOG_URL, params)
return defer.succeed(None) return defer.succeed(None)
@ -653,7 +652,7 @@ class LBRYDaemon(jsonrpc.JSONRPC):
if self.connection_problem_checker.running: if self.connection_problem_checker.running:
self.connection_problem_checker.stop() self.connection_problem_checker.stop()
d = self._upload_log(name_prefix="close", exclude_previous=False if self.first_run else True) d = self._upload_log(log_type="close", exclude_previous=False if self.first_run else True)
d.addCallback(lambda _: self._stop_server()) d.addCallback(lambda _: self._stop_server())
d.addErrback(lambda err: True) d.addErrback(lambda err: True)
d.addCallback(lambda _: self.lbry_file_manager.stop()) d.addCallback(lambda _: self.lbry_file_manager.stop())
@ -2172,9 +2171,9 @@ class LBRYDaemon(jsonrpc.JSONRPC):
if p: if p:
if 'name_prefix' in p.keys(): if 'name_prefix' in p.keys():
prefix = p['name_prefix'] + '_api' log_type = p['name_prefix'] + '_api'
else: else:
prefix = None log_type = None
if 'exclude_previous' in p.keys(): if 'exclude_previous' in p.keys():
exclude_previous = p['exclude_previous'] exclude_previous = p['exclude_previous']
@ -2189,10 +2188,10 @@ class LBRYDaemon(jsonrpc.JSONRPC):
else: else:
force = False force = False
else: else:
prefix = "api" log_type = "api"
exclude_previous = True exclude_previous = True
d = self._upload_log(name_prefix=prefix, exclude_previous=exclude_previous, force=force) d = self._upload_log(log_type=log_type, exclude_previous=exclude_previous, force=force)
if 'message' in p.keys(): if 'message' in p.keys():
d.addCallback(lambda _: self._log_to_slack(p['message'])) 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))