tMerge branch 'master' of https://github.com/spesmilo/electrum - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 3ce5eef076ce1f28d4f57e7e3dcb74c2582a15e5
DIR parent 8833555b35b49fe3b62539692e0b6c8950c0e31f
HTML Author: Maran <maran.hidskes@gmail.com>
Date: Tue, 9 Oct 2012 17:15:05 +0200
Merge branch 'master' of https://github.com/spesmilo/electrum
Diffstat:
M lib/interface.py | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
---
DIR diff --git a/lib/interface.py b/lib/interface.py
t@@ -264,12 +264,13 @@ class TcpStratumInterface(Interface):
def init_socket(self):
global proxy_modes
+ connection_msg = "%s:%d"%(self.host,self.port)
if self.proxy is None:
self.s = socket.socket( socket.AF_INET, socket.SOCK_STREAM )
else:
+ connection_msg += " using proxy %s:%s:%s"%(self.proxy.get('mode'), self.proxy.get('host'), self.proxy.get('port'))
import socks
self.s = socks.socksocket()
- print "Using Proxy", self.proxy
self.s.setproxy(proxy_modes.index(self.proxy["mode"]), self.proxy["host"], int(self.proxy["port"]) )
self.s.settimeout(60)
self.s.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1)
t@@ -277,10 +278,10 @@ class TcpStratumInterface(Interface):
self.s.connect(( self.host.encode('ascii'), int(self.port)))
self.is_connected = True
self.send([('server.version', [ELECTRUM_VERSION])])
- print "Connected to %s:%d"%(self.host,self.port)
+ print "Connected to " + connection_msg
except:
self.is_connected = False
- print_error("Not connected")
+ print_error("Failed to connect" + connection_msg)
def run(self):
try: