Browse Source

fix logging

add-joinmarket
zebra-lucky 1 year ago
parent
commit
d319f6ed92
  1. 10
      electrum/plugins/joinmarket/jm_main.py
  2. 1
      electrum/plugins/joinmarket/jm_wallet.py
  3. 4
      electrum/plugins/joinmarket/notes.txt

10
electrum/plugins/joinmarket/jm_main.py

@ -25,12 +25,8 @@ class JMManager(Logger):
self.wallet = wallet self.wallet = wallet
self.network = None self.network = None
self.loop = None self.loop = None
Logger.__init__(self)
self.config = config = wallet.config self.config = config = wallet.config
self.jmw = JMWallet(self) Logger.__init__(self)
self.jmconf = JMConf(self)
self.jmw.jmconf = self.jmconf
self.log_handler = JMGUILogHandler(self) self.log_handler = JMGUILogHandler(self)
self.logger = logging.LoggerAdapter(self.logger, self.logger = logging.LoggerAdapter(self.logger,
{'jmman_id': id(self)}) {'jmman_id': id(self)})
@ -38,6 +34,10 @@ class JMManager(Logger):
self.tumble_logsdir = logsdir = pathlib.Path(config.path) / "logs" self.tumble_logsdir = logsdir = pathlib.Path(config.path) / "logs"
self.tumble_log = get_tumble_log(self, logsdir, config) self.tumble_log = get_tumble_log(self, logsdir, config)
self.jmw = JMWallet(self)
self.jmconf = JMConf(self)
self.jmw.jmconf = self.jmconf
self.states = JMStates self.states = JMStates
self.state_lock = threading.Lock() self.state_lock = threading.Lock()

1
electrum/plugins/joinmarket/jm_wallet.py

@ -495,7 +495,6 @@ class JMWallet(KeyPairsMixin, WalletDBMixin, JMBaseCodeMixin, EventListener):
@ignore_exceptions # don't kill outer taskgroup @ignore_exceptions # don't kill outer taskgroup
async def main_loop(self): async def main_loop(self):
self.logger.info("starting taskgroup.")
try: try:
async with self.taskgroup as group: async with self.taskgroup as group:
await group.spawn(self.do_synchronize_loop()) await group.spawn(self.do_synchronize_loop())

4
electrum/plugins/joinmarket/notes.txt

@ -1,12 +1,10 @@
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
plugin: plugin:
- check onion/IRC single/multiple password/no passdword join - check onion/IRC single/multiple password/no passdword join
- make_keypairs_cache logger.info not shown in Qt log
- jm_qt_obwatch: sorting by columns, filter by text
- remove addrask from scheule?
- save last shedule tx as done to wallet schedule when confirmed - save last shedule tx as done to wallet schedule when confirmed
- jm_qt_obwatch: advanced sorting by columns, filter by text
- потрібно якось документувати - потрібно якось документувати
- irc reconnect interval 5 sec -> change to progressive interval - irc reconnect interval 5 sec -> change to progressive interval

Loading…
Cancel
Save