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

Logging tweaks

Browse Source
This commit is contained in:
Neil Booth 2016-12-21 21:15:48 +09:00
parent d45e174e03
commit a81b8917d8
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
server/protocol.py
View File

@ -111,7 +111,6 @@ class ServerManager(util.LoggedClass):
limit += limit // 2 limit += limit // 2
bands.append(limit) bands.append(limit)
self.bands = sorted(bands) self.bands = sorted(bands)
self.logger.info('bands: {}'.format(self.bands))
def session_priority(self, session): def session_priority(self, session):
if isinstance(session, LocalRPC): if isinstance(session, LocalRPC):
@ -120,6 +119,9 @@ class ServerManager(util.LoggedClass):
return 1 + (bisect_left(self.bands, session.bandwidth_used) return 1 + (bisect_left(self.bands, session.bandwidth_used)
+ bisect_left(self.bands, group_bandwidth) + 1) // 2 + bisect_left(self.bands, group_bandwidth) + 1) // 2
def is_deprioritized(self, session):
return self.session_priority(session) > self.BANDS
async def enqueue_delayed_sessions(self): async def enqueue_delayed_sessions(self):
while True: while True:
now = time.time() now = time.time()
@ -232,6 +234,7 @@ class ServerManager(util.LoggedClass):
.format(self.max_subs)) .format(self.max_subs))
self.logger.info('max subscriptions per session: {:,d}' self.logger.info('max subscriptions per session: {:,d}'
.format(self.env.max_session_subs)) .format(self.env.max_session_subs))
self.logger.info('bands: {}'.format(self.bands))
await self.start_external_servers() await self.start_external_servers()
async def start_external_servers(self): async def start_external_servers(self):
@ -641,7 +644,7 @@ class Session(JSONRPC):
def connection_lost(self, exc): def connection_lost(self, exc):
'''Handle client disconnection.''' '''Handle client disconnection.'''
super().connection_lost(exc) super().connection_lost(exc)
if (self.pause or self.manager.session_priority(self) >= 5 if (self.pause or self.manager.is_deprioritized(self)
or self.send_size >= 1024*1024 or self.error_count): or self.send_size >= 1024*1024 or self.error_count):
self.log_info('disconnected. Sent {:,d} bytes in {:,d} messages ' self.log_info('disconnected. Sent {:,d} bytes in {:,d} messages '
'{:,d} errors' '{:,d} errors'