Madiator2011/lbry-sdk
1
0
Fork 0
forked from LBRYCommunity/lbry-sdk
Code Pull requests Activity

switch LogUploader to use an already encoded lbryid

Browse source
This commit is contained in:
Job Evers-Meltzer 2016-10-27 19:36:43 -05:00
parent 779ba8e214
commit 6fa624ec8a
1 changed files with 19 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
lbrynet/core/log_support.py
View file

@ -7,7 +7,6 @@ import platform
import sys import sys
import traceback import traceback
import base58
import requests import requests
from requests_futures.sessions import FuturesSession from requests_futures.sessions import FuturesSession
@ -242,23 +241,33 @@ class LogUploader(object):
self.log_file = log_file self.log_file = log_file
self.log_size = log_size self.log_size = log_size
def upload(self, exclude_previous, lbryid, log_type): def upload(self, exclude_previous, id_hash, log_type):
if not os.path.isfile(self.log_file): if not os.path.isfile(self.log_file):
return return
log_contents = self.log_contents(exclude_previous)
params = {
'date': datetime.datetime.utcnow().strftime('%Y%m%d-%H%M%S'),
'hash': id_hash,
'sys': platform.system(),
'type': self.get_type(log_type),
'log': log_contents
}
requests.post(settings.LOG_POST_URL, params)
def log_contents(self, exclude_previous):
with open(self.log_file) as f: with open(self.log_file) as f:
if exclude_previous: if exclude_previous:
f.seek(self.log_size) f.seek(self.log_size)
log_contents = f.read() log_contents = f.read()
else: else:
log_contents = f.read() log_contents = f.read()
params = { return log_contents
'date': datetime.datetime.utcnow().strftime('%Y%m%d-%H%M%S'),
'hash': base58.b58encode(lbryid)[:20], def get_type(self, log_type):
'sys': platform.system(), if log_type:
'type': "%s-%s" % (self.log_name, log_type) if log_type else self.log_name, return "%s-%s" % (self.log_name, log_type)
'log': log_contents else:
} return self.log_name
requests.post(settings.LOG_POST_URL, params)
@classmethod @classmethod
def load(cls, log_name, log_file): def load(cls, log_name, log_file):