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 13:31:00 +04:00
parent d16bf99fda
commit 0922c7d3f4
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pybtc/connector/connector.py
View File

@ -424,12 +424,12 @@ class Connector:
for h in tx_bin_list: for h in tx_bin_list:
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_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:
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()
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; [%s]" % (block["height"], tx_rate, tx_rate_last)) self.log.info("Blocks %s; tx rate: %s; [%s]" % (block["height"], tx_rate, tx_rate_last))
if self.utxo_data: if self.utxo_data:
@ -464,7 +464,8 @@ class Connector:
self.utxo.deleted_utxo, self.utxo.deleted_utxo,
self.utxo.loaded_utxo)) self.utxo.loaded_utxo))
if self.utxo.read_from_db_time_total: if self.utxo.read_from_db_time_total:
c = round(self.utxo.read_from_db_count / self.utxo.read_from_db_time_total, 4) c = round(self.utxo.read_from_db_count
/ (time.time() - self.utxo.read_from_db_batch_time), 4)
else: else:
c = 0 c = 0
self.log.debug(" Read from db last batch %s; " self.log.debug(" Read from db last batch %s; "
@ -474,7 +475,7 @@ class Connector:
self.utxo.read_from_db_count, self.utxo.read_from_db_count,
c, c,
int(self.utxo.read_from_db_time_total))) int(self.utxo.read_from_db_time_total)))
self.utxo.read_from_db_time = 0 self.utxo.read_from_db_batch_time = time.time()
self.utxo.read_from_db_count = 0 self.utxo.read_from_db_count = 0
self.log.debug("- Coins ---------------") self.log.debug("- Coins ---------------")
self.log.debug(" Coins %s; destroyed %s; " self.log.debug(" Coins %s; destroyed %s; "

1
pybtc/connector/utxo.py
View File

@ -44,6 +44,7 @@ class UTXO():
self.deleted_last_block = 0 self.deleted_last_block = 0
self.deleted_utxo = 0 self.deleted_utxo = 0
self.read_from_db_time = 0 self.read_from_db_time = 0
self.read_from_db_batch_time = time.time()
self.read_from_db_count = 0 self.read_from_db_count = 0
self.read_from_db_time_total = 0 self.read_from_db_time_total = 0
self.loaded_utxo = 0 self.loaded_utxo = 0