CopterExpress/clever-show
1
0
Fork 0
mirror of https://github.com/CopterExpress/clever-show.git synced 2026-06-06 12:09:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Connection rewrite: update client and server connection logic (#49)

Browse Source
This commit is contained in:
Arthur Golubtsov
2019-10-07 20:05:39 +03:00
committed by GitHub
parent 590431c00b
commit ca4b4aa1bf
5 changed files with 115 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
Drone/client.py
View File

@@ -16,7 +16,7 @@ current_dir = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentfra
parent_dir = os.path.dirname(current_dir)
sys.path.insert(0, parent_dir)
#logging.basicConfig(level=logging.INFO)
logging.basicConfig(level=logging.DEBUG)
logger = logging.getLogger(__name__)
import messaging_lib as messaging
@@ -103,7 +103,7 @@ class Client(object):
try:
while True:
self._reconnect()
self._process_connections()
#self._process_connections()
except (KeyboardInterrupt, ):
logger.critical("Caught interrupt, exiting!")
@@ -142,7 +142,7 @@ class Client(object):
def _connect(self):
self.connected = True
self.client_socket.setblocking(False)
events = selectors.EVENT_READ | selectors.EVENT_WRITE
events = selectors.EVENT_READ # | selectors.EVENT_WRITE
self.selector.register(self.client_socket, events, data=self.server_connection)
self.server_connection.connect(self.selector, self.client_socket, (self.server_host, self.server_port))
self._process_connections()
@@ -187,39 +187,31 @@ class Client(object):
def _process_connections(self):
while True:
events = self.selector.select(timeout=1)
if events:
for key, mask in events:
if key.data is None:
pass
else:
connection = key.data
try:
connection.process_events(mask)
# logging.debug("tick")
for key, mask in events: # TODO add notifier to client!
connection = key.data
if connection is None:
pass
else:
try:
connection.process_events(mask)
except Exception as error:
logger.error(
"Exception {} occurred for {}! Resetting connection!".format(error, connection.addr)
)
self.server_connection.close()
self.connected = False
except Exception as error:
logger.error(
"Exception {} occurred for {}! Resetting connection!".format(error, connection.addr)
)
self.server_connection.close()
self.connected = False
if isinstance(error, OSError):
if error.errno == errno.EINTR:
raise KeyboardInterrupt
if isinstance(error, OSError):
if error.errno == errno.EINTR:
raise KeyboardInterrupt
else:
time.sleep(0.001)
if not self.selector.get_map():
logger.warning("No active connections left!")
return
time.sleep(0.001)
#def connection_processor(self):
# while not self._shutdown_event.is_set():
# self._running_event.wait()
# self._process_connections()
@messaging.request_callback("id")
def _response_id():