From: Forrest Voight <forrest@forre.st>
Date: Fri, 19 Oct 2012 03:19:19 +0000 (-0400)
Subject: fixed ordering of "Testing bitcoind XXX connection" messages during startup
X-Git-Tag: 9.0~41
X-Git-Url: https://git.novaco.in/?p=p2pool.git;a=commitdiff_plain;h=38cc5846c5752de7b539e189b7c84ffb06bb290e

fixed ordering of "Testing bitcoind XXX connection" messages during startup
---

diff --git a/p2pool/main.py b/p2pool/main.py
index 1202209..ff85aac 100644
--- a/p2pool/main.py
+++ b/p2pool/main.py
@@ -98,9 +98,6 @@ def main(args, net, datadir_path, merged_urls, worker_endpoint):
         yield check()
         temp_work = yield getwork(bitcoind)
         
-        if not args.testnet:
-            factory = yield connect_p2p()
-        
         bitcoind_warning_var = variable.Variable(None)
         @defer.inlineCallbacks
         def poll_warnings():
@@ -114,6 +111,9 @@ def main(args, net, datadir_path, merged_urls, worker_endpoint):
         print '    Current block height: %i' % (temp_work['height'] - 1,)
         print
         
+        if not args.testnet:
+            factory = yield connect_p2p()
+        
         print 'Determining payout address...'
         if args.pubkey_hash is None:
             address_path = os.path.join(datadir_path, 'cached_payout_address')