getinfo RPC: change height reporting

Also rename watched to subs
Closes #80
This commit is contained in:
Neil Booth 2016-12-18 07:57:48 +09:00
parent ef54413054
commit 6679eea04c

View File

@ -408,7 +408,8 @@ class ServerManager(util.LoggedClass):
def server_summary(self): def server_summary(self):
'''A one-line summary of server state.''' '''A one-line summary of server state.'''
return { return {
'blocks': self.bp.db_height, 'daemon_height': self.bp.daemon.cached_height(),
'db_height': self.bp.db_height,
'closing': len([s for s in self.sessions if s.is_closing()]), 'closing': len([s for s in self.sessions if s.is_closing()]),
'errors': sum(s.error_count for s in self.sessions), 'errors': sum(s.error_count for s in self.sessions),
'groups': len(self.groups), 'groups': len(self.groups),
@ -416,8 +417,8 @@ class ServerManager(util.LoggedClass):
'peers': len(self.irc.peers), 'peers': len(self.irc.peers),
'requests': sum(s.requests_remaining() for s in self.sessions), 'requests': sum(s.requests_remaining() for s in self.sessions),
'sessions': self.session_count(), 'sessions': self.session_count(),
'subs': self.subscription_count,
'txs_sent': self.txs_sent, 'txs_sent': self.txs_sent,
'watched': self.subscription_count,
} }
@staticmethod @staticmethod