|
|
@@ -104,6 +104,7 @@ class Server(object):
|
|
|
host,
|
|
|
port=None,
|
|
|
af_family="AF_INET",
|
|
|
+ log_ip=False,
|
|
|
max_allowed_clients=5,
|
|
|
handler=None,
|
|
|
handler_kwargs={},
|
|
|
@@ -113,6 +114,7 @@ class Server(object):
|
|
|
self.host=host
|
|
|
self.port=port
|
|
|
self.af_family = af_family
|
|
|
+ self.log_ip = log_ip
|
|
|
self.handler_kwargs = handler_kwargs
|
|
|
self.handler = handler
|
|
|
self.max_allowed_clients = max_allowed_clients
|
|
|
@@ -140,9 +142,8 @@ class Server(object):
|
|
|
def make_handler(self, conn, addr):
|
|
|
return self.handler(conn, addr, self, **self.handler_kwargs)
|
|
|
def register_conn(self, conn, addr):
|
|
|
- lserver.info(
|
|
|
- "New Connection, addr: '{}', socket: '{}'".format(addr,conn)
|
|
|
- )
|
|
|
+ # if self.log_ip:
|
|
|
+ # lserver.info("New connection from {} on port {}".format(*addr))
|
|
|
self.read_sockets_expected.append(conn)
|
|
|
if addr:
|
|
|
self.conn_to_addr[conn] = addr
|
|
|
@@ -192,17 +193,15 @@ 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.info(
|
|
|
+ "New connection from {} on port {}".format(*addr))
|
|
|
lserver.debug("peername: '{}', sockname: '{}'".format(
|
|
|
conn.getpeername(),
|
|
|
conn.getsockname(),
|
|
|
))
|
|
|
+ handler = self.make_handler(conn, addr)
|
|
|
+ self.register_conn(conn, addr)
|
|
|
+ self.register_handler(handler, conn)
|
|
|
elif ( socket_handler
|
|
|
and (socket_handler in self.connection_handler) ):
|
|
|
lserver.debug("handling client connection")
|
