transport.read_blocking, fixes socket transport
This commit is contained in:
parent
694452c861
commit
1409665302
|
@ -1,5 +1,4 @@
|
||||||
import struct
|
import struct
|
||||||
import bitkey_pb2 as proto
|
|
||||||
import mapping
|
import mapping
|
||||||
|
|
||||||
class Transport(object):
|
class Transport(object):
|
||||||
|
@ -33,11 +32,22 @@ class Transport(object):
|
||||||
def read(self):
|
def read(self):
|
||||||
if not self.ready_to_read():
|
if not self.ready_to_read():
|
||||||
return None
|
return None
|
||||||
|
|
||||||
data = self._read()
|
data = self._read()
|
||||||
if data == None:
|
if data == None:
|
||||||
return None
|
return None
|
||||||
|
|
||||||
|
return self._parse_message(data)
|
||||||
|
|
||||||
|
def read_blocking(self):
|
||||||
|
while True:
|
||||||
|
data = self._read()
|
||||||
|
if data != None:
|
||||||
|
break
|
||||||
|
|
||||||
|
return self._parse_message(data)
|
||||||
|
|
||||||
|
def _parse_message(self, data):
|
||||||
(msg_type, data) = data
|
(msg_type, data) = data
|
||||||
inst = mapping.get_class(msg_type)()
|
inst = mapping.get_class(msg_type)()
|
||||||
inst.ParseFromString(data)
|
inst.ParseFromString(data)
|
||||||
|
|
|
@ -47,7 +47,7 @@ class SocketTransportClient(Transport):
|
||||||
return (msg_type, self.filelike.read(datalen))
|
return (msg_type, self.filelike.read(datalen))
|
||||||
except socket.error:
|
except socket.error:
|
||||||
print "Failed to read from device"
|
print "Failed to read from device"
|
||||||
raise
|
return None
|
||||||
|
|
||||||
class SocketTransport(Transport):
|
class SocketTransport(Transport):
|
||||||
def __init__(self, device, *args, **kwargs):
|
def __init__(self, device, *args, **kwargs):
|
||||||
|
@ -72,7 +72,9 @@ class SocketTransport(Transport):
|
||||||
self.socket.listen(5)
|
self.socket.listen(5)
|
||||||
|
|
||||||
def _disconnect_client(self):
|
def _disconnect_client(self):
|
||||||
|
print "Disconnecting client"
|
||||||
if self.client != None:
|
if self.client != None:
|
||||||
|
self.client.close()
|
||||||
self.client = None
|
self.client = None
|
||||||
self.filelike = None
|
self.filelike = None
|
||||||
|
|
||||||
|
@ -82,7 +84,7 @@ class SocketTransport(Transport):
|
||||||
self.socket = None
|
self.socket = None
|
||||||
|
|
||||||
def ready_to_read(self):
|
def ready_to_read(self):
|
||||||
if self.client:
|
if self.filelike:
|
||||||
# Connected
|
# Connected
|
||||||
rlist, _, _ = select([self.client], [], [], 0)
|
rlist, _, _ = select([self.client], [], [], 0)
|
||||||
return len(rlist) > 0
|
return len(rlist) > 0
|
||||||
|
@ -96,20 +98,22 @@ class SocketTransport(Transport):
|
||||||
return self.ready_to_read()
|
return self.ready_to_read()
|
||||||
return False
|
return False
|
||||||
|
|
||||||
|
|
||||||
def _write(self, msg):
|
def _write(self, msg):
|
||||||
if self.filelike:
|
if self.filelike:
|
||||||
# None on disconnected client
|
# None on disconnected client
|
||||||
self.filelike.write(msg)
|
|
||||||
self.filelike.flush()
|
try:
|
||||||
|
self.filelike.write(msg)
|
||||||
|
self.filelike.flush()
|
||||||
|
except socket.error:
|
||||||
|
print "Socket error"
|
||||||
|
self._disconnect_client()
|
||||||
|
|
||||||
def _read(self):
|
def _read(self):
|
||||||
try:
|
try:
|
||||||
(msg_type, datalen) = self._read_headers(self.filelike)
|
(msg_type, datalen) = self._read_headers(self.filelike)
|
||||||
return (msg_type, self.filelike.read(datalen))
|
return (msg_type, self.filelike.read(datalen))
|
||||||
except socket.error:
|
|
||||||
print "Failed to read from device"
|
|
||||||
raise
|
|
||||||
except Exception:
|
except Exception:
|
||||||
|
print "Failed to read from device"
|
||||||
self._disconnect_client()
|
self._disconnect_client()
|
||||||
return None
|
return None
|
Loading…
Reference in New Issue