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

Merge branch 'develop'

Browse Source
This commit is contained in:
Neil Booth 2016-12-09 22:41:44 +09:00
commit fac3c70c65
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/protocol.py
View File

@ -555,15 +555,15 @@ class ServerManager(util.LoggedClass):
fmt = ('{:<6} {:<5} {:>23} {:>15} {:>7} ' fmt = ('{:<6} {:<5} {:>23} {:>15} {:>7} '
'{:>7} {:>7} {:>7} {:>7} {:>5} {:>9}') '{:>7} {:>7} {:>7} {:>7} {:>5} {:>9}')
yield fmt.format('ID', 'Flags', 'Peer', 'Client', 'Subs', yield fmt.format('ID', 'Flags', 'Peer', 'Client', 'Reqs',
'Reqs', 'Txs', 'Recv', 'Recv KB', 'Sent', 'Txs', 'Subs', 'Recv', 'Recv KB', 'Sent',
'Sent KB', 'Time') 'Sent KB', 'Time')
for (id_, flags, peer, client, subs, reqs, txs_sent, for (id_, flags, peer, client, reqs, txs_sent, subs,
recv_count, recv_size, send_count, send_size, time) in data: recv_count, recv_size, send_count, send_size, time) in data:
yield fmt.format(id_, flags, peer, client, yield fmt.format(id_, flags, peer, client,
'{:,d}'.format(subs),
'{:,d}'.format(reqs), '{:,d}'.format(reqs),
'{:,d}'.format(txs_sent), '{:,d}'.format(txs_sent),
'{:,d}'.format(subs),
'{:,d}'.format(recv_count), '{:,d}'.format(recv_count),
'{:,d}'.format(recv_size // 1024), '{:,d}'.format(recv_size // 1024),
'{:,d}'.format(send_count), '{:,d}'.format(send_count),

2
server/version.py
View File

@ -1 +1 @@
VERSION = "ElectrumX 0.8.8" VERSION = "ElectrumX 0.8.8a"