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

Move from .format to f'' strings

Browse Source
This commit is contained in:
Neil Booth 2018-08-13 10:19:08 +09:00
parent 6dafbfd455
commit 4e40e26ac4
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
electrumx/server/daemon.py
View File

@ -56,9 +56,9 @@ class Daemon(object):
self.urls = urls self.urls = urls
self.url_index = 0 self.url_index = 0
for n, url in enumerate(urls): for n, url in enumerate(urls):
self.logger.info('daemon #{:d} at {}{}' status = '' if n else ' (current)'
.format(n + 1, self.logged_url(url), logged_url = self.logged_url(url)
'' if n else ' (current)')) self.logger.info(f'daemon #{n + 1} at {logged_url}{status}')
def url(self): def url(self):
'''Returns the current daemon URL.''' '''Returns the current daemon URL.'''
@ -71,7 +71,7 @@ class Daemon(object):
''' '''
if len(self.urls) > 1: if len(self.urls) > 1:
self.url_index = (self.url_index + 1) % len(self.urls) self.url_index = (self.url_index + 1) % len(self.urls)
self.logger.info('failing over to {}'.format(self.logged_url())) self.logger.info(f'failing over to {self.logged_url()}')
return True return True
return False return False
@ -106,8 +106,7 @@ class Daemon(object):
if prior_time and self.failover(): if prior_time and self.failover():
secs = 0 secs = 0
else: else:
self.logger.error('{} Retrying occasionally...' self.logger.error(f'{error} Retrying occasionally...')
.format(error))
down = False down = False
last_error_time = 0 last_error_time = 0
@ -122,8 +121,7 @@ class Daemon(object):
if down: if down:
self.logger.info('connection restored') self.logger.info('connection restored')
return result return result
log_error('HTTP error code {:d}: {}' log_error(f'HTTP error code {result[0]}: {result[1]}')
.format(result[0], result[1]))
except asyncio.TimeoutError: except asyncio.TimeoutError:
log_error('timeout error.') log_error('timeout error.')
except aiohttp.ServerDisconnectedError: except aiohttp.ServerDisconnectedError:
@ -202,10 +200,9 @@ class Daemon(object):
# probably because we did not provide arguments # probably because we did not provide arguments
available = True available = True
else: else:
self.logger.warning('error (code {:d}: {}) when testing ' self.logger.warning(f'error (code {error_code}: '
'RPC availability of method {}' f'{err.get("message")}) testing '
.format(error_code, err.get("message"), f'RPC availability of method {method}')
method))
available = False available = False
self._available_rpcs[method] = available self._available_rpcs[method] = available
return available return available