|
|
@@ -192,21 +192,29 @@ class Server(object):
|
|
|
if ( s == self.socket ):
|
|
|
lserver.debug("handling new client")
|
|
|
conn, addr = self.socket.accept()
|
|
|
+ lserver.debug("conn: '{}', addr: '{}'".format(
|
|
|
+ conn,
|
|
|
+ addr,
|
|
|
+ ))
|
|
|
handler = self.make_handler(conn, addr)
|
|
|
self.register_conn(conn, addr)
|
|
|
self.register_handler(handler, conn)
|
|
|
+ lserver.debug("peername: '{}', sockname: '{}'".format(
|
|
|
+ conn.getpeername(),
|
|
|
+ conn.getsockname(),
|
|
|
+ ))
|
|
|
elif ( socket_handler
|
|
|
and (socket_handler in self.connection_handler) ):
|
|
|
lserver.debug("handling client connection")
|
|
|
try:
|
|
|
data = socket_handler.recv()
|
|
|
if not data:
|
|
|
- lserver.info("connection {} closed")
|
|
|
+ lserver.info("connection {} closed".format(self.socket))
|
|
|
self.unregister_handler(socket_handler, s)
|
|
|
self.unregister_conn(conn)
|
|
|
socket_handler.close()
|
|
|
else:
|
|
|
- lschat.info("Client:"+data_decoded.strip())
|
|
|
+ lschat.info("Client:"+data.strip())
|
|
|
socket_handler.handle(data)
|
|
|
except Exception as e:
|
|
|
lserver.error(e, exc_info=True)
|
