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

move run_reflector_server into settings file and add debug lines

Browse source
This commit is contained in:
Jack 2016-08-10 16:51:46 -04:00
parent d6f902653f
commit 132aa569fe
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lbrynet/lbrynet_daemon/LBRYDaemon.py
View file

@ -175,9 +175,6 @@ class LBRYDaemon(jsonrpc.JSONRPC):
self.first_run_after_update = False self.first_run_after_update = False
self.uploaded_temp_files = [] self.uploaded_temp_files = []
# change this to enable reflector server
self.run_reflector_server = False
if os.name == "nt": if os.name == "nt":
from lbrynet.winhelpers.knownpaths import get_path, FOLDERID, UserHandle from lbrynet.winhelpers.knownpaths import get_path, FOLDERID, UserHandle
default_download_directory = get_path(FOLDERID.Downloads, UserHandle.current) default_download_directory = get_path(FOLDERID.Downloads, UserHandle.current)
@ -216,6 +213,7 @@ class LBRYDaemon(jsonrpc.JSONRPC):
'use_upnp': True, 'use_upnp': True,
'start_lbrycrdd': True, 'start_lbrycrdd': True,
'requested_first_run_credits': False, 'requested_first_run_credits': False,
'run_reflector_server': False,
'cache_time': DEFAULT_CACHE_TIME, 'cache_time': DEFAULT_CACHE_TIME,
'startup_scripts': [], 'startup_scripts': [],
'last_version': {'lbrynet': lbrynet_version, 'lbryum': lbryum_version} 'last_version': {'lbrynet': lbrynet_version, 'lbryum': lbryum_version}
@ -275,6 +273,7 @@ class LBRYDaemon(jsonrpc.JSONRPC):
self.search_timeout = self.session_settings['search_timeout'] self.search_timeout = self.session_settings['search_timeout']
self.download_timeout = self.session_settings['download_timeout'] self.download_timeout = self.session_settings['download_timeout']
self.max_search_results = self.session_settings['max_search_results'] self.max_search_results = self.session_settings['max_search_results']
self.run_reflector_server = self.session_settings['run_reflector_server']
#### ####
# #
# Ignore the saved wallet type. Some users will have their wallet type # Ignore the saved wallet type. Some users will have their wallet type
@ -684,6 +683,7 @@ class LBRYDaemon(jsonrpc.JSONRPC):
def _start_reflector(self): def _start_reflector(self):
if self.run_reflector_server: if self.run_reflector_server:
log.info("Starting reflector server")
if self.reflector_port is not None: if self.reflector_port is not None:
reflector_factory = reflector.ServerFactory( reflector_factory = reflector.ServerFactory(
self.session.peer_manager, self.session.peer_manager,
@ -698,6 +698,7 @@ class LBRYDaemon(jsonrpc.JSONRPC):
def _stop_reflector(self): def _stop_reflector(self):
if self.run_reflector_server: if self.run_reflector_server:
log.info("Stopping reflector server")
try: try:
if self.reflector_server_port is not None: if self.reflector_server_port is not None:
self.reflector_server_port, p = None, self.reflector_server_port self.reflector_server_port, p = None, self.reflector_server_port

1
lbrynet/lbrynet_daemon/LBRYPublisher.py
View file

@ -70,6 +70,7 @@ class Publisher(object):
return d return d
def start_reflector(self): def start_reflector(self):
log.info("Start reflector client")
factory = reflector.ClientFactory( factory = reflector.ClientFactory(
self.session.blob_manager, self.session.blob_manager,
self.lbry_file_manager.stream_info_manager, self.lbry_file_manager.stream_info_manager,

3
lbrynet/reflector/client/client.py
View file

@ -118,10 +118,12 @@ class LBRYFileReflectorClient(Protocol):
reactor.callLater(0, self.producer.resumeProducing) reactor.callLater(0, self.producer.resumeProducing)
def get_blobs_to_send(self, stream_info_manager, stream_hash): def get_blobs_to_send(self, stream_info_manager, stream_hash):
log.info("Get blobs to send to reflector")
d = stream_info_manager.get_blobs_for_stream(stream_hash) d = stream_info_manager.get_blobs_for_stream(stream_hash)
def set_blobs(blob_hashes): def set_blobs(blob_hashes):
for blob_hash, position, iv, length in blob_hashes: for blob_hash, position, iv, length in blob_hashes:
log.info("Preparing to send %s", blob_hash)
if blob_hash is not None: if blob_hash is not None:
self.blob_hashes_to_send.append(blob_hash) self.blob_hashes_to_send.append(blob_hash)
@ -202,6 +204,7 @@ class LBRYFileReflectorClient(Protocol):
raise ValueError("Couldn't open that blob for some reason. blob_hash: {}".format(blob.blob_hash)) raise ValueError("Couldn't open that blob for some reason. blob_hash: {}".format(blob.blob_hash))
def send_blob_info(self): def send_blob_info(self):
log.info("Send blob info for %s", self.next_blob_to_send.blob_hash)
assert self.next_blob_to_send is not None, "need to have a next blob to send at this point" assert self.next_blob_to_send is not None, "need to have a next blob to send at this point"
self.write(json.dumps({ self.write(json.dumps({
'blob_hash': self.next_blob_to_send.blob_hash, 'blob_hash': self.next_blob_to_send.blob_hash,