|
|
@@ -34,6 +34,7 @@ import digilib.misc
|
|
|
|
|
|
lclient = logging.getLogger(__name__+".client")
|
|
|
lserver = logging.getLogger(__name__+".server")
|
|
|
+lch = logging.getLogger(__name__+".chandler")
|
|
|
lschat = logging.getLogger(__name__+".server.chat")
|
|
|
lcchat = logging.getLogger(__name__+".client.chat")
|
|
|
|
|
|
@@ -62,15 +63,15 @@ class ConnHandlerBase(object):
|
|
|
try:
|
|
|
await self.send(bytes())
|
|
|
except:
|
|
|
- lserver.debug("error during disconenct")
|
|
|
+ lch.debug("error during disconenct")
|
|
|
try:
|
|
|
await self.socket.shutdown(0)
|
|
|
except:
|
|
|
- lserver.debug("error during socket shutdown")
|
|
|
+ lch.debug("error during socket shutdown")
|
|
|
try:
|
|
|
await self.socket.close()
|
|
|
except:
|
|
|
- lserver.debug("error closing socket")
|
|
|
+ lch.debug("error closing socket")
|
|
|
|
|
|
async def handle(self, data):
|
|
|
"""
|
|
|
@@ -86,7 +87,7 @@ class ConnHandlerBase(object):
|
|
|
"""
|
|
|
This method waits for the client to send something and returns bytes!
|
|
|
"""
|
|
|
- data_received = await self.socket.recv(self.block_size)
|
|
|
+ data_received = await ConnHandlerBase.socket.recv(self,self.block_size)
|
|
|
return data_received
|
|
|
|
|
|
async def send(self, data, log_msg=None):
|
|
|
@@ -102,7 +103,7 @@ class ConnHandlerBase(object):
|
|
|
await self.socket.send(data)
|
|
|
return True
|
|
|
except Exception as e:
|
|
|
- lserver.error(e, exc_info=True)
|
|
|
+ lch.error(e, exc_info=True)
|
|
|
return False
|
|
|
|
|
|
|
|
|
@@ -125,15 +126,15 @@ class ConnHandler(ConnHandlerBase):
|
|
|
try:
|
|
|
await self.send("")
|
|
|
except:
|
|
|
- lserver.debug("error during disconenct")
|
|
|
+ lch.debug("error during disconenct")
|
|
|
try:
|
|
|
await self.socket.shutdown(0)
|
|
|
except:
|
|
|
- lserver.debug("error during socket shutdown")
|
|
|
+ lch.debug("error during socket shutdown")
|
|
|
try:
|
|
|
await self.socket.close()
|
|
|
except:
|
|
|
- lserver.debug("error closing socket")
|
|
|
+ lch.debug("error closing socket")
|
|
|
|
|
|
async def handle(self, data):
|
|
|
return
|
|
|
@@ -151,7 +152,8 @@ class ConnHandler(ConnHandlerBase):
|
|
|
"""
|
|
|
if block_size == None:
|
|
|
block_size = self.block_size
|
|
|
- data_received = await self.recv(block_size=block_size)
|
|
|
+ lch.debug("self.__class__: {}".format(self.__class__))
|
|
|
+ data_received = await ConnHandlerBase.recv(self,block_size=block_size)
|
|
|
data_decoded = data_received.decode("utf-8")
|
|
|
return data_decoded
|
|
|
|
