catch ssl exception caused by timeout
This commit is contained in:
parent
a6e7470b11
commit
35882f7fb7
|
@ -17,7 +17,7 @@
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
|
||||||
import random, socket, ast, re
|
import random, socket, ast, re, ssl
|
||||||
import threading, traceback, sys, time, json, Queue
|
import threading, traceback, sys, time, json, Queue
|
||||||
|
|
||||||
from version import ELECTRUM_VERSION
|
from version import ELECTRUM_VERSION
|
||||||
|
@ -226,7 +226,6 @@ class Interface(threading.Thread):
|
||||||
def init_tcp(self, host, port, proxy=None, use_ssl=True):
|
def init_tcp(self, host, port, proxy=None, use_ssl=True):
|
||||||
self.init_server(host, port, proxy, use_ssl)
|
self.init_server(host, port, proxy, use_ssl)
|
||||||
|
|
||||||
import ssl
|
|
||||||
global proxy_modes
|
global proxy_modes
|
||||||
self.connection_msg = "%s:%d"%(self.host,self.port)
|
self.connection_msg = "%s:%d"%(self.host,self.port)
|
||||||
if self.proxy is None:
|
if self.proxy is None:
|
||||||
|
@ -257,11 +256,15 @@ class Interface(threading.Thread):
|
||||||
try:
|
try:
|
||||||
out = ''
|
out = ''
|
||||||
while self.is_connected:
|
while self.is_connected:
|
||||||
try: msg = self.s.recv(1024)
|
try:
|
||||||
|
msg = self.s.recv(1024)
|
||||||
except socket.timeout:
|
except socket.timeout:
|
||||||
# ping the server with server.version, as a real ping does not exist yet
|
# ping the server with server.version, as a real ping does not exist yet
|
||||||
self.send([('server.version', [ELECTRUM_VERSION])])
|
self.send([('server.version', [ELECTRUM_VERSION])])
|
||||||
continue
|
continue
|
||||||
|
except ssl.SSLError:
|
||||||
|
self.send([('server.version', [ELECTRUM_VERSION])])
|
||||||
|
continue
|
||||||
out += msg
|
out += msg
|
||||||
self.bytes_received += len(msg)
|
self.bytes_received += len(msg)
|
||||||
if msg == '':
|
if msg == '':
|
||||||
|
|
Loading…
Reference in New Issue