handle disconnects

This commit is contained in:
ThomasV 2012-03-13 17:31:29 +01:00
parent b36a71cf93
commit 94b4ad8be7
2 changed files with 6 additions and 3 deletions

View File

@ -1039,7 +1039,7 @@ class ElectrumWindow:
if self.wallet.interface.blocks == 0: if self.wallet.interface.blocks == 0:
self.status_image.set_from_stock(gtk.STOCK_NO, gtk.ICON_SIZE_MENU) self.status_image.set_from_stock(gtk.STOCK_NO, gtk.ICON_SIZE_MENU)
text = "Server not ready" text = "Server not ready"
elif not self.wallet.interface.was_polled: elif not self.wallet.interface.is_up_to_date:
self.status_image.set_from_stock(gtk.STOCK_REFRESH, gtk.ICON_SIZE_MENU) self.status_image.set_from_stock(gtk.STOCK_REFRESH, gtk.ICON_SIZE_MENU)
text = "Synchronizing..." text = "Synchronizing..."
else: else:

View File

@ -221,6 +221,9 @@ class TCPInterface(Interface):
while True: while True:
msg = self.s.recv(1024) msg = self.s.recv(1024)
out += msg out += msg
if msg == '':
self.is_connected = False
raise BaseException('Socket was disconnected')
while True: while True:
s = out.find('\n') s = out.find('\n')
if s==-1: break if s==-1: break
@ -230,9 +233,9 @@ class TCPInterface(Interface):
cmd = c.get('method') cmd = c.get('method')
if cmd == 'server.banner': if cmd == 'server.banner':
self.message = c.get('result') self.message = c.get('result')
if cmd == 'numblocks.subscribe': elif cmd == 'numblocks.subscribe':
self.blocks = c.get('result') self.blocks = c.get('result')
print "received numblocks",self.blocks print "num blocks",self.blocks
elif cmd =='address.subscribe': elif cmd =='address.subscribe':
addr = c.get('address') addr = c.get('address')
status = c.get('status') status = c.get('status')