aljaz/python-teos
1
0
Fork 0
mirror of https://github.com/aljazceru/python-teos.git synced 2025-12-18 06:34:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Handling errors when constructing the Watcher in pisa daemon

Browse Source
This commit is contained in:
Salvatore Ingala
2019-10-17 12:05:43 +08:00
parent deaf704bc5
commit f19c499efa
2 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
pisa/pisad.py
View File

@@ -29,13 +29,16 @@ if __name__ == '__main__':
# FIXME: Leaving this here for future option/arguments
pass
if can_connect_to_bitcoind():
if in_correct_network(BTC_NETWORK):
# Fire the api
start_api()
try:
if can_connect_to_bitcoind():
if in_correct_network(BTC_NETWORK):
# Fire the api
start_api()
else:
logger.error("bitcoind is running on a different network, check conf.py and bitcoin.conf. Shutting down")
else:
logger.error("bitcoind is running on a different network, check conf.py and bitcoin.conf. Shutting down")
else:
logger.error("Can't connect to bitcoind. Shutting down")
logger.error("Can't connect to bitcoind. Shutting down")
except Exception e:
logger.error("There was an error while starting the daemon. Shutting down", error_args=e.args)

8
pisa/watcher.py
View File

@@ -22,11 +22,11 @@ class Watcher:
self.max_appointments = max_appointments
self.zmq_subscriber = None
self.responder = Responder()
if SIGNING_KEY_FILE is not None:
self.signing_key = SigningKey.from_pem(open(SIGNING_KEY_FILE).read())
if SIGNING_KEY_FILE is None:
raise ValueError("No signing key provided. Please fix your pisa.conf")
else:
self.signing_key = None
logger.warning("No signing key provided. Appointments will not be signed.")
self.signing_key = SigningKey.from_pem(open(SIGNING_KEY_FILE).read())
def add_appointment(self, appointment):
# Rationale: