From: Forrest Voight <forrest@forre.st>
Date: Sun, 25 Aug 2013 21:45:54 +0000 (-0400)
Subject: warn user about bitcoin connection slots if p2p connect takes longer than 5 seconds
X-Git-Tag: 13.4~26
X-Git-Url: https://git.novaco.in/?p=p2pool.git;a=commitdiff_plain;h=60518a079cd431d758ce646e1953d016d48ca2df

warn user about bitcoin connection slots if p2p connect takes longer than 5 seconds
---

diff --git a/p2pool/main.py b/p2pool/main.py
index 7e923d9..fdd3d65 100644
--- a/p2pool/main.py
+++ b/p2pool/main.py
@@ -37,7 +37,11 @@ def main(args, net, datadir_path, merged_urls, worker_endpoint):
             print '''Testing bitcoind P2P connection to '%s:%s'...''' % (args.bitcoind_address, args.bitcoind_p2p_port)
             factory = bitcoin_p2p.ClientFactory(net.PARENT)
             reactor.connectTCP(args.bitcoind_address, args.bitcoind_p2p_port, factory)
+            def long():
+                print '''    ...taking a while. Common reasons for this include all of bitcoind's connection slots being used...'''
+            long_dc = reactor.callLater(5, long)
             yield factory.getProtocol() # waits until handshake is successful
+            if not long_dc.called: long_dc.cancel()
             print '    ...success!'
             print
             defer.returnValue(factory)