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

Final cleanup

Browse Source
This commit is contained in:
Neil Booth 2016-11-12 21:48:34 +09:00
parent cb7b7dd1fe
commit c93f6cb920
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
electrumx_rpc.py
View File

@ -48,8 +48,8 @@ class RPCClient(asyncio.Protocol):
fmt = '{:<4} {:>23} {:>7} {:>15} {:>7}' fmt = '{:<4} {:>23} {:>7} {:>15} {:>7}'
print(fmt.format('Type', 'Peer', 'Subs', 'Client', 'Time')) print(fmt.format('Type', 'Peer', 'Subs', 'Client', 'Time'))
for kind, peer, subs, client, time in result: for kind, peer, subs, client, time in result:
print(fmt.format(kind, peer, '{:,d}'.format(subs) print(fmt.format(kind, peer, '{:,d}'.format(subs),
client, '{:,d}'.format(int(time))) client, '{:,d}'.format(int(time))))
else: else:
pprint.pprint(result, indent=4) pprint.pprint(result, indent=4)

6
server/block_processor.py
View File

@ -692,12 +692,12 @@ class BlockProcessor(server.db.DB):
db_cache_size = len(self.db_cache) * 105 db_cache_size = len(self.db_cache) * 105
hist_cache_size = len(self.history) * 180 + self.history_size * 4 hist_cache_size = len(self.history) * 180 + self.history_size * 4
tx_hash_size = (self.tx_count - self.db_tx_count) * 74 tx_hash_size = (self.tx_count - self.db_tx_count) * 74
utxo_MB = (db_deletes_size + utxo_cache_size + tx_hash_size) // one_MB utxo_MB = (db_cache_size + utxo_cache_size + tx_hash_size) // one_MB
hist_MB = hist_cache_size // one_MB hist_MB = hist_cache_size // one_MB
self.logger.info('UTXOs: {:,d} deletes: {:,d} ' self.logger.info('UTXOs: {:,d} deletes: {:,d} '
'UTXOs {:,d}MB hist {:,d}MB' 'UTXOs {:,d}MB hist {:,d}MB'
.format(len(self.utxo_cache), len(self.db_deletes), .format(len(self.utxo_cache), self.db_deletes,
utxo_MB, hist_MB)) utxo_MB, hist_MB))
self.logger.info('our height: {:,d} daemon height: {:,d}' self.logger.info('our height: {:,d} daemon height: {:,d}'
.format(self.height, self.daemon.cached_height())) .format(self.height, self.daemon.cached_height()))
@ -990,7 +990,7 @@ class BlockProcessor(server.db.DB):
'DB spends: {:,d}' 'DB spends: {:,d}'
.format(len(self.utxo_cache) + self.utxo_cache_spends, .format(len(self.utxo_cache) + self.utxo_cache_spends,
self.utxo_cache_spends, self.utxo_cache_spends,
len(self.db_deletes) // 2)) self.db_deletes))
fs_flush_start = time.time() fs_flush_start = time.time()
self.fs_flush() self.fs_flush()

7
server/protocol.py
View File

@ -43,7 +43,7 @@ class BlockServer(BlockProcessor):
self.irc = IRC(env) self.irc = IRC(env)
async def caught_up(self, mempool_hashes): async def caught_up(self, mempool_hashes):
await super().caught_up(mempool_hashes) await super().caught_up([]) #mempool_hashes)
if not self.servers: if not self.servers:
await self.start_servers() await self.start_servers()
if self.env.irc: if self.env.irc:
@ -632,8 +632,9 @@ class LocalRPC(JSONRPC):
async def sessions(self, params): async def sessions(self, params):
now = time.time() now = time.time()
return [(session.kind, session.peername, len(session.hash168s), return [(session.kind,
session.client, now - session.start) 'this RPC client' if session == self else session.peername,
len(session.hash168s), session.client, now - session.start)
for session in self.SESSION_MGR.sessions] for session in self.SESSION_MGR.sessions]
async def numsessions(self, params): async def numsessions(self, params):