afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

small fix to coresendmsg and client disconnects no longer log as an exception

Browse source
This commit is contained in:
Blake J. Harnden 2018-03-16 13:10:34 -07:00
parent d46aaa1005
commit bc1ef88f82
2 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
daemon/core/corehandlers.py
View file

@ -506,7 +506,10 @@ class CoreRequestHandler(SocketServer.BaseRequestHandler):
while True: while True:
try: try:
message = self.receive_message() message = self.receive_message()
except (IOError, EOFError): except EOFError:
logger.info("client disconnected")
break
except IOError:
logger.exception("error receiving message") logger.exception("error receiving message")
break break

8
daemon/scripts/coresendmsg
View file

@ -98,7 +98,7 @@ def connect_to_session(sock, requested):
connect to the first one. connect to the first one.
""" """
# request the session list # request the session list
tlvdata = coreapi.CoreSessionTlv.pack(SessionTlvs.NUMBER.value, "0") tlvdata = coreapi.CoreSessionTlv.pack(SessionTlvs.NUMBER.value, "")
flags = MessageFlags.STRING.value flags = MessageFlags.STRING.value
smsg = coreapi.CoreSessionMessage.pack(flags, tlvdata) smsg = coreapi.CoreSessionMessage.pack(flags, tlvdata)
sock.sendall(smsg) sock.sendall(smsg)
@ -130,9 +130,9 @@ def connect_to_session(sock, requested):
print "requested session not found!" print "requested session not found!"
return False return False
print "joining session %s..." % session print "joining session: %s" % session
tlvdata = coreapi.CoreSessionTlv.pack(SessionTlvs.NUMBER, session) tlvdata = coreapi.CoreSessionTlv.pack(SessionTlvs.NUMBER.value, session)
flags = MessageFlags.ADD flags = MessageFlags.ADD.value
smsg = coreapi.CoreSessionMessage.pack(flags, tlvdata) smsg = coreapi.CoreSessionMessage.pack(flags, tlvdata)
sock.sendall(smsg) sock.sendall(smsg)
return True return True