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

Make WarmingUpError file-scope

Browse Source
This commit is contained in:
Neil Booth 2018-08-13 19:24:59 +09:00
parent 1b618d19d4
commit 6950fca7cb
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
electrumx/server/daemon.py
View File

@ -29,8 +29,12 @@ class DaemonError(Exception):
'''Raised when the daemon returns an error in its results.''' '''Raised when the daemon returns an error in its results.'''
class WarmingUpError(Exception):
'''Internal - when the daemon is warming up.'''
class WorkQueueFullError(Exception): class WorkQueueFullError(Exception):
pass '''Internal - when the daemon's work queue is full.'''
class Daemon(object): class Daemon(object):
@ -39,9 +43,6 @@ class Daemon(object):
WARMING_UP = -28 WARMING_UP = -28
id_counter = itertools.count() id_counter = itertools.count()
class DaemonWarmingUpError(Exception):
'''Raised when the daemon returns an error in its results.'''
def __init__(self, coin, url, max_workqueue=10, init_retry=0.25, def __init__(self, coin, url, max_workqueue=10, init_retry=0.25,
max_retry=4.0): max_retry=4.0):
self.coin = coin self.coin = coin
@ -139,7 +140,7 @@ class Daemon(object):
except aiohttp.ClientConnectionError: except aiohttp.ClientConnectionError:
log_error('connection problem - is your daemon running?') log_error('connection problem - is your daemon running?')
on_good_message = 'connection restored' on_good_message = 'connection restored'
except self.DaemonWarmingUpError: except WarmingUpError:
log_error('starting up checking blocks.') log_error('starting up checking blocks.')
on_good_message = 'running normally' on_good_message = 'running normally'
except WorkQueueFullError: except WorkQueueFullError:
@ -156,7 +157,7 @@ class Daemon(object):
if not err: if not err:
return result['result'] return result['result']
if err.get('code') == self.WARMING_UP: if err.get('code') == self.WARMING_UP:
raise self.DaemonWarmingUpError raise WarmingUpError
raise DaemonError(err) raise DaemonError(err)
payload = {'method': method, 'id': next(self.id_counter)} payload = {'method': method, 'id': next(self.id_counter)}
@ -173,7 +174,7 @@ class Daemon(object):
def processor(result): def processor(result):
errs = [item['error'] for item in result if item['error']] errs = [item['error'] for item in result if item['error']]
if any(err.get('code') == self.WARMING_UP for err in errs): if any(err.get('code') == self.WARMING_UP for err in errs):
raise self.DaemonWarmingUpError raise WarmingUpError
if not errs or replace_errs: if not errs or replace_errs:
return [item['result'] for item in result] return [item['result'] for item in result]
raise DaemonError(errs) raise DaemonError(errs)