AddressSynchronizer: set diagnostic_name for better logs
fixes regression from 121d8732f1
in particular, this is needed for Synchronizer.diagnostic_name and SPV.diagnostic_name
This commit is contained in:
@@ -42,6 +42,7 @@ from .util import EventListener, event_listener
|
||||
if TYPE_CHECKING:
|
||||
from .network import Network
|
||||
from .wallet_db import WalletDB
|
||||
from .simple_config import SimpleConfig
|
||||
|
||||
|
||||
TX_HEIGHT_FUTURE = -3
|
||||
@@ -66,9 +67,10 @@ class AddressSynchronizer(Logger, EventListener):
|
||||
synchronizer: Optional['Synchronizer']
|
||||
verifier: Optional['SPV']
|
||||
|
||||
def __init__(self, db: 'WalletDB', config):
|
||||
def __init__(self, db: 'WalletDB', config: 'SimpleConfig', *, name: str = None):
|
||||
self.db = db
|
||||
self.config = config
|
||||
self.name = name
|
||||
self.network = None
|
||||
Logger.__init__(self)
|
||||
# verifier (SPV) and synchronizer are started in start_network
|
||||
@@ -91,6 +93,9 @@ class AddressSynchronizer(Logger, EventListener):
|
||||
|
||||
self.load_and_cleanup()
|
||||
|
||||
def diagnostic_name(self):
|
||||
return self.name or ""
|
||||
|
||||
def with_transaction_lock(func):
|
||||
def func_wrapper(self: 'AddressSynchronizer', *args, **kwargs):
|
||||
with self.transaction_lock:
|
||||
|
||||
@@ -325,7 +325,7 @@ class WatchTower(LNWatcher):
|
||||
LOGGING_SHORTCUT = 'W'
|
||||
|
||||
def __init__(self, network):
|
||||
adb = AddressSynchronizer(WalletDB({}, manual_upgrades=False), network.config)
|
||||
adb = AddressSynchronizer(WalletDB({}, manual_upgrades=False), network.config, name=self.diagnostic_name())
|
||||
adb.start_network(network)
|
||||
LNWatcher.__init__(self, adb, network)
|
||||
self.network = network
|
||||
|
||||
@@ -318,7 +318,7 @@ class Abstract_Wallet(ABC, Logger, EventListener):
|
||||
Logger.__init__(self)
|
||||
|
||||
self.network = None
|
||||
self.adb = AddressSynchronizer(db, config)
|
||||
self.adb = AddressSynchronizer(db, config, name=self.diagnostic_name())
|
||||
for addr in self.get_addresses():
|
||||
self.adb.add_address(addr)
|
||||
self.lock = self.adb.lock
|
||||
|
||||
Reference in New Issue
Block a user