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

Improved daemon logging

Browse Source
This commit is contained in:
Neil Booth 2016-11-06 08:36:11 +09:00
parent 18efa67f1d
commit db29121d58
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
server/daemon.py
View File

@ -70,9 +70,13 @@ class Daemon(util.LoggedClass):
''' '''
data = json.dumps(payload) data = json.dumps(payload)
secs = 1 secs = 1
prior_msg = None
while True: while True:
try: try:
return await self.post(data) result = await self.post(data)
if prior_msg:
self.logger.error('connection successfully restored')
return result
except asyncio.TimeoutError: except asyncio.TimeoutError:
msg = 'timeout error' msg = 'timeout error'
except aiohttp.ClientHttpProcessingError: except aiohttp.ClientHttpProcessingError:
@ -84,10 +88,14 @@ class Daemon(util.LoggedClass):
except DaemonWarmingUpError: except DaemonWarmingUpError:
msg = 'daemon is still warming up' msg = 'daemon is still warming up'
self.logger.error('{}. Sleeping {:d}s and trying again...' if msg != prior_msg or count == 10:
.format(msg, secs)) self.logger.error('{}. Retrying between sleeps...'
.format(msg))
prior_msg = msg
count = 0
await asyncio.sleep(secs) await asyncio.sleep(secs)
secs = min(180, secs * 2) count += 1
secs = min(16, secs * 2)
async def send_single(self, method, params=None): async def send_single(self, method, params=None):
'''Send a single request to the daemon.''' '''Send a single request to the daemon.'''