RanchiMall/pyflo
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

connector

Browse Source
This commit is contained in:
4tochka 2019-06-03 09:46:55 +04:00
parent 163a924068
commit 60654ab8bb
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pybtc/connector/block_loader.py
View File

@ -73,11 +73,11 @@ class BlockLoader:
if self.last_batch_size < 1000000 and self.rpc_batch_limit < 450: if self.last_batch_size < 1000000 and self.rpc_batch_limit < 450:
self.rpc_batch_limit += 50 self.rpc_batch_limit += 50
self.log.warning("rpc batch limit %s " % self.rpc_batch_limit) self.log.warning("rpc batch limit %s " % self.rpc_batch_limit)
elif self.last_batch_size > 40000000 and self.rpc_batch_limit > 150: elif self.last_batch_size > 40000000 and self.rpc_batch_limit > 100:
self.rpc_batch_limit -= 50 self.rpc_batch_limit -= 40
self.log.warning("rpc batch limit %s " % self.rpc_batch_limit) self.log.warning("rpc batch limit %s " % self.rpc_batch_limit)
elif self.last_batch_size > 80000000 and self.rpc_batch_limit < 60: elif self.last_batch_size > 80000000 and self.rpc_batch_limit < 100:
self.rpc_batch_limit = 40 self.rpc_batch_limit = 20
self.log.warning("rpc batch limit %s " % self.rpc_batch_limit) self.log.warning("rpc batch limit %s " % self.rpc_batch_limit)
for i in self.worker_busy: for i in self.worker_busy:
@ -227,9 +227,9 @@ class Worker:
self.loop.set_default_executor(ThreadPoolExecutor(20)) self.loop.set_default_executor(ThreadPoolExecutor(20))
self.out_writer = out_writer self.out_writer = out_writer
self.in_reader = in_reader self.in_reader = in_reader
self.coins = MRU(1000000) self.coins = MRU(4000000)
self.destroyed_coins = MRU(1000000) self.destroyed_coins = MRU(4000000)
self.a_coins = MRU(1000000) self.a_coins = MRU(4000000)
signal.signal(signal.SIGTERM, self.terminate) signal.signal(signal.SIGTERM, self.terminate)
self.loop.create_task(self.message_loop()) self.loop.create_task(self.message_loop())
self.loop.run_forever() self.loop.run_forever()
@ -260,6 +260,7 @@ class Worker:
result = await self.rpc.batch(batch) result = await self.rpc.batch(batch)
break break
except: except:
self.log.critical(str(traceback.format_exc()))
await asyncio.sleep(5) await asyncio.sleep(5)
attempt -= 1 attempt -= 1
if not attempt: if not attempt:

8
pybtc/connector/connector.py
View File

@ -90,7 +90,8 @@ class Connector:
self.preload_cached = 0 self.preload_cached = 0
self.preload_cached_annihilated = 0 self.preload_cached_annihilated = 0
self.start_time = time.time() self.start_time = time.time()
self.total_received_tx_last = 0
self.start_time_last = time.time()
# cache and system # cache and system
self.block_preload_cache_limit = block_preload_cache_limit self.block_preload_cache_limit = block_preload_cache_limit
self.block_hashes_cache_limit = block_hashes_cache_limit self.block_hashes_cache_limit = block_hashes_cache_limit
@ -424,10 +425,13 @@ class Connector:
self.tx_cache.pop(h) self.tx_cache.pop(h)
tx_rate = round(self.total_received_tx / (time.time() - self.start_time), 4) tx_rate = round(self.total_received_tx / (time.time() - self.start_time), 4)
tx_rate_last = round(self.total_received_tx_last / (time.time() - self.start_time_last), 4)
self.total_received_tx_last = 0
self.start_time_last = time.time()
t = 10000 if not self.deep_synchronization else 100000 t = 10000 if not self.deep_synchronization else 100000
if (self.total_received_tx - self.total_received_tx_stat) > t: if (self.total_received_tx - self.total_received_tx_stat) > t:
self.total_received_tx_stat = self.total_received_tx self.total_received_tx_stat = self.total_received_tx
self.log.info("Blocks %s; tx rate: %s;" % (block["height"], tx_rate)) self.log.info("Blocks %s; tx rate: %s; [%s]" % (block["height"], tx_rate, tx_rate_last))
if self.utxo_data: if self.utxo_data:
loading = "Loading ... " if self.cache_loading else "" loading = "Loading ... " if self.cache_loading else ""
if self.deep_synchronization: if self.deep_synchronization: