From 97d26036e52ef43160498b46e57843942fb6b096 Mon Sep 17 00:00:00 2001
From: Adam Gibson <ekaggata@gmail.com>
Date: Tue, 13 Sep 2016 14:08:00 +0300
Subject: [PATCH] reinstantiate log startup messages for bots, and remove
 duplicate log for ob-watcher

---
 joinmarket/yieldgenerator.py | 2 +-
 ob-watcher.py                | 3 +--
 sendpayment.py               | 1 +
 tumbler.py                   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/joinmarket/yieldgenerator.py b/joinmarket/yieldgenerator.py
index 2a915366..f44a961c 100644
--- a/joinmarket/yieldgenerator.py
+++ b/joinmarket/yieldgenerator.py
@@ -141,11 +141,11 @@ def ygmain(ygclass, txfee=1000, cjfee_a=200, cjfee_r=0.002, ordertype='reloffer'
     wallet = Wallet(seed, max_mix_depth=mix_levels)
     jm_single().bc_interface.sync_wallet(wallet)
 
-    log.debug('starting yield generator')
     mcs = [IRCMessageChannel(c, realname='btcint=' + jm_single().config.get(
                                  "BLOCKCHAIN", "blockchain_source"),
                         password=nickserv_password) for c in get_irc_mchannels()]
     mcc = MessageChannelCollection(mcs)
+    log.debug('starting yield generator')
     maker = ygclass(mcc, wallet, [options.txfee, cjfee_a, cjfee_r,
                                   options.ordertype, options.minsize, mix_levels])
     try:
diff --git a/ob-watcher.py b/ob-watcher.py
index 431fec39..5cb5570e 100644
--- a/ob-watcher.py
+++ b/ob-watcher.py
@@ -344,7 +344,6 @@ def on_welcome(self):
 
 
 def main():
-    jm_single().nickname = random_nick()  # watcher' +binascii.hexlify(os.urandom(4))
     load_program_config()
 
     parser = OptionParser(
@@ -369,7 +368,7 @@ def main():
     hostport = (options.host, options.port)
     mcs = [IRCMessageChannel(c) for c in get_irc_mchannels()]
     mcc = MessageChannelCollection(mcs)
-
+    log.debug("Starting ob-watcher")
     # todo: is the call to GUITaker needed, or the return. taker unused
     taker = GUITaker(mcc, hostport)
     print('starting irc')
diff --git a/sendpayment.py b/sendpayment.py
index 52e6c844..497b6762 100644
--- a/sendpayment.py
+++ b/sendpayment.py
@@ -320,6 +320,7 @@ def main():
 
     mcs = [IRCMessageChannel(c) for c in get_irc_mchannels()]
     mcc = MessageChannelCollection(mcs)
+    log.debug("starting sendpayment")
     taker = SendPayment(mcc, wallet, destaddr, amount, options.makercount,
                         options.txfee, options.waittime, options.mixdepth,
                         options.answeryes, chooseOrdersFunc)
diff --git a/tumbler.py b/tumbler.py
index 43e2e0af..21f82bbb 100644
--- a/tumbler.py
+++ b/tumbler.py
@@ -634,9 +634,9 @@ def main():
                     max_mix_depth=options['mixdepthsrc'] + options['mixdepthcount'])
     jm_single().bc_interface.sync_wallet(wallet)
     jm_single().wait_for_commitments = 1
-    log.debug('starting tumbler')
     mcs = [IRCMessageChannel(c) for c in get_irc_mchannels()]
     mcc = MessageChannelCollection(mcs)
+    log.debug('starting tumbler')
     tumbler = Tumbler(mcc, wallet, tx_list, options)
     try:
         log.debug('connecting to message channels')