X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=server_%2Fio.py;h=c8f6114514b460ed0ccf3101ce09dd7185f02649;hb=8746c041c61dad2feb5f7c8cf3f103869dc69dbd;hp=220003768c598c71ed48d26fc090c68f0a0d2b5c;hpb=23462b9ad5f46f8dd323aed66e557235802e3c98;p=plomrogue2-experiments
diff --git a/server_/io.py b/server_/io.py
index 2200037..c8f6114 100644
--- a/server_/io.py
+++ b/server_/io.py
@@ -4,6 +4,7 @@ import queue
import sys
sys.path.append('../')
import parser
+from server_.game_error import GameError
# Avoid "Address already in use" errors.
@@ -44,45 +45,39 @@ class IO_Handler(socketserver.BaseRequestHandler):
instructions.
"""
- import plom_socket_io
- def caught_send(socket, message):
- """Send message by socket, catch broken socket connection error."""
- try:
- plom_socket_io.send(socket, message)
- except plom_socket_io.BrokenSocketConnection:
- pass
-
- def send_queue_messages(socket, queue_in, thread_alive):
+ def send_queue_messages(plom_socket, queue_in, thread_alive):
"""Send messages via socket from queue_in while thread_alive[0]."""
while thread_alive[0]:
try:
msg = queue_in.get(timeout=1)
except queue.Empty:
continue
- caught_send(socket, msg)
+ plom_socket.send(msg, True)
import uuid
+ import plom_socket
+ plom_socket = plom_socket.PlomSocket(self.request)
print('CONNECTION FROM:', str(self.client_address))
connection_id = uuid.uuid4()
queue_in = queue.Queue()
self.server.queue_out.put(('ADD_QUEUE', connection_id, queue_in))
thread_alive = [True]
t = threading.Thread(target=send_queue_messages,
- args=(self.request, queue_in, thread_alive))
+ args=(plom_socket, queue_in, thread_alive))
t.start()
- for message in plom_socket_io.recv(self.request):
+ for message in plom_socket.recv():
if message is None:
- caught_send(self.request, 'BAD MESSAGE')
+ plom_socket.send('BAD MESSAGE', True)
elif 'QUIT' == message:
- caught_send(self.request, 'BYE')
+ plom_socket.send('BYE', True)
break
else:
self.server.queue_out.put(('COMMAND', connection_id, message))
self.server.queue_out.put(('KILL_QUEUE', connection_id))
thread_alive[0] = False
print('CONNECTION CLOSED FROM:', str(self.client_address))
- self.request.close()
+ plom_socket.socket.close()
class GameIO():
@@ -172,7 +167,7 @@ class GameIO():
f.write(input_ + '\n')
except parser.ArgError as e:
answer(connection_id, 'ARGUMENT_ERROR ' + quote(str(e)))
- except server_.game.GameError as e:
+ except GameError as e:
answer(connection_id, 'GAME_ERROR ' + quote(str(e)))
def send(self, msg, connection_id=None):