Fixes from PR review

This commit is contained in:
Salvatore Ingala
2019-10-10 18:22:33 +07:00
parent aea1d1f1e0
commit 9f25ef8603
12 changed files with 33 additions and 39 deletions

View File

@@ -1,11 +1,10 @@
import json
from flask import Flask, request, Response, abort, jsonify
from pisa import HOST, PORT, logging, bitcoin_cli
from pisa import HOST, PORT, logging
from pisa.logger import Logger
from pisa.watcher import Watcher
from pisa.inspector import Inspector
from pisa import HOST, PORT, logging
from pisa.appointment import Appointment
from pisa.block_processor import BlockProcessor

View File

@@ -27,4 +27,7 @@ class Logger(object):
logging.debug(StructuredMessage(self._add_prefix(msg), actor=self.actor, **kwargs))
def error(self, msg, **kwargs):
logging.error(StructuredMessage(self._add_prefix(msg), actor=self.actor, **kwargs))
logging.error(StructuredMessage(self._add_prefix(msg), actor=self.actor, **kwargs))
def warn(self, msg, **kwargs):
logging.warn(StructuredMessage(self._add_prefix(msg), actor=self.actor, **kwargs))

View File

@@ -5,7 +5,7 @@ from pisa.logger import Logger
from pisa.api import start_api
from pisa.tools import can_connect_to_bitcoind, in_correct_network
logger = Logger("Pisad")
logger = Logger("Daemon")
if __name__ == '__main__':
debug = False
@@ -23,4 +23,4 @@ if __name__ == '__main__':
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")

View File

@@ -12,6 +12,7 @@ from pisa.utils.zmq_subscriber import ZMQHandler
logger = Logger("Watcher")
class Watcher:
def __init__(self, max_appointments=MAX_APPOINTMENTS):
self.appointments = dict()