Skip to content
This repository was archived by the owner on May 13, 2022. It is now read-only.

Commit 97d2603

Browse files
committed
reinstantiate log startup messages for bots, and remove duplicate log for ob-watcher
1 parent 4352d1f commit 97d2603

4 files changed

Lines changed: 4 additions & 4 deletions

File tree

joinmarket/yieldgenerator.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,11 +141,11 @@ def ygmain(ygclass, txfee=1000, cjfee_a=200, cjfee_r=0.002, ordertype='reloffer'
141141
wallet = Wallet(seed, max_mix_depth=mix_levels)
142142
jm_single().bc_interface.sync_wallet(wallet)
143143

144-
log.debug('starting yield generator')
145144
mcs = [IRCMessageChannel(c, realname='btcint=' + jm_single().config.get(
146145
"BLOCKCHAIN", "blockchain_source"),
147146
password=nickserv_password) for c in get_irc_mchannels()]
148147
mcc = MessageChannelCollection(mcs)
148+
log.debug('starting yield generator')
149149
maker = ygclass(mcc, wallet, [options.txfee, cjfee_a, cjfee_r,
150150
options.ordertype, options.minsize, mix_levels])
151151
try:

ob-watcher.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,6 @@ def on_welcome(self):
344344

345345

346346
def main():
347-
jm_single().nickname = random_nick() # watcher' +binascii.hexlify(os.urandom(4))
348347
load_program_config()
349348

350349
parser = OptionParser(
@@ -369,7 +368,7 @@ def main():
369368
hostport = (options.host, options.port)
370369
mcs = [IRCMessageChannel(c) for c in get_irc_mchannels()]
371370
mcc = MessageChannelCollection(mcs)
372-
371+
log.debug("Starting ob-watcher")
373372
# todo: is the call to GUITaker needed, or the return. taker unused
374373
taker = GUITaker(mcc, hostport)
375374
print('starting irc')

sendpayment.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -320,6 +320,7 @@ def main():
320320

321321
mcs = [IRCMessageChannel(c) for c in get_irc_mchannels()]
322322
mcc = MessageChannelCollection(mcs)
323+
log.debug("starting sendpayment")
323324
taker = SendPayment(mcc, wallet, destaddr, amount, options.makercount,
324325
options.txfee, options.waittime, options.mixdepth,
325326
options.answeryes, chooseOrdersFunc)

tumbler.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -634,9 +634,9 @@ def main():
634634
max_mix_depth=options['mixdepthsrc'] + options['mixdepthcount'])
635635
jm_single().bc_interface.sync_wallet(wallet)
636636
jm_single().wait_for_commitments = 1
637-
log.debug('starting tumbler')
638637
mcs = [IRCMessageChannel(c) for c in get_irc_mchannels()]
639638
mcc = MessageChannelCollection(mcs)
639+
log.debug('starting tumbler')
640640
tumbler = Tumbler(mcc, wallet, tx_list, options)
641641
try:
642642
log.debug('connecting to message channels')

0 commit comments

Comments
 (0)