opengnsys
/
ogagent
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#940: Fix byte-int conversions.

remotes/github/python3
Ramón M. Gómez 2020-07-07 17:51:49 +02:00
parent db05f930b5
commit b21ea0708b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/opengnsys/ipc.py
View File

@ -128,7 +128,7 @@ class ClientProcessor(threading.Thread):
# Client disconnected # Client disconnected
self.running = False self.running = False
break break
buf = int(b) # Empty buffer, this is set as non-blocking buf = int.from_bytes(b, 'big') # Empty buffer, this is set as non-blocking
if state is None: if state is None:
if buf in (REQ_MESSAGE, REQ_LOGIN, REQ_LOGOUT): if buf in (REQ_MESSAGE, REQ_LOGIN, REQ_LOGOUT):
logger.debug('State set to {}'.format(buf)) logger.debug('State set to {}'.format(buf))
@ -153,7 +153,7 @@ class ClientProcessor(threading.Thread):
recv_data = b'' recv_data = b''
continue continue
elif state == ST_RECEIVING: elif state == ST_RECEIVING:
recv_data += bytes(buf) recv_data += bytes([buf])
msg_len -= 1 msg_len -= 1
if msg_len == 0: if msg_len == 0:
self.processRequest(recv_msg, recv_data) self.processRequest(recv_msg, recv_data)
@ -315,7 +315,7 @@ class ClientIPC(threading.Thread):
data = str.encode(data) data = str.encode(data)
l = len(data) l = len(data)
msg = bytes(msg) + bytes(l & 0xFF) + bytes(l >> 8) + data msg = bytes([msg]) + bytes([l & 0xFF]) + bytes([l >> 8]) + data
self.clientSocket.sendall(msg) self.clientSocket.sendall(msg)
def sendLogin(self, username, language): def sendLogin(self, username, language):

2
src/opengnsys/log.py
View File

@ -62,7 +62,7 @@ class Logger(object):
Sets log level filter (minimum level required for a log message to be processed) Sets log level filter (minimum level required for a log message to be processed)
:param level: Any message with a level below this will be filtered out :param level: Any message with a level below this will be filtered out
""" """
if isinstance(level, six.string_types): if isinstance(level, str):
level = _levelName.get(level, INFO) level = _levelName.get(level, INFO)
self.logLevel = level # Ensures level is an integer or fails self.logLevel = level # Ensures level is an integer or fails