murmur/tt-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新log记录格式

Browse Source
This commit is contained in:
CSSC-WORK\murmur 2024-01-24 10:48:28 +08:00
parent 0f8e0dd8fa
commit 0c594af127
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
s2f.py
View File

@ -13,7 +13,7 @@ def save2file(data,isR=1):
if not os.path.exists(p): if not os.path.exists(p):
os.makedirs(p) os.makedirs(p)
l=f"{'[R]' if isR else '[T]'} - {t} --- {data.hex(' ')}\n" l=f"{'[R]' if isR else '[T]'} - {t} --- {data}\n"
f=open('/'.join(['trlog',d,'trlog.txt']),'a') f=open('/'.join(['trlog',d,'trlog.txt']),'a')
f.write(l) f.write(l)
f.close f.close

12
server.py
View File

@ -285,7 +285,7 @@ def tt_hh(addr, data):
msg[-1] = crc msg[-1] = crc
add_timestamp() add_timestamp()
addr.send(msg) addr.send(msg)
s2f.save2file(msg,0) s2f.save2file(f"[SERVER --> {get_ccid(addr).decode() if get_ccid(addr) else 'None'}][{len(msg)}] {msg.hex(' ')}",0)
logger.debug("服务器回复心跳包。") logger.debug("服务器回复心跳包。")
# 从缓存中匹配到数据才重发 # 从缓存中匹配到数据才重发
@ -300,7 +300,7 @@ def tt_hh(addr, data):
add_timestamp() add_timestamp()
# 按缓存先后顺序发送 # 按缓存先后顺序发送
addr.send(msgs[i]) addr.send(msgs[i])
s2f.save2file(msg) s2f.save2file(f"[SERVER --> {get_ccid(addr).decode() if get_ccid(addr) else 'None'}][{len(msg)}] {msg.hex(' ')}")
time.sleep(1) time.sleep(1)
# 成功则清空已发送成功的缓存数据 # 成功则清空已发送成功的缓存数据
cache[ccid].pop(0) cache[ccid].pop(0)
@ -378,7 +378,7 @@ def tt_trans(addr, data):
try: try:
add_timestamp() add_timestamp()
taddr.send(msg) taddr.send(msg)
s2f.save2file(msg,0) s2f.save2file(f"[SERVER --> {get_ccid(taddr).decode() if get_ccid(taddr) else 'None'}][{len(msg)}] {msg.hex(' ')}",0)
logger.info(f"数据发送成功。 {sccid} --> {tccid}") logger.info(f"数据发送成功。 {sccid} --> {tccid}")
s2wx("","",f"匹配到在线终端, 数据发送成功。 \n{sccid.decode()} ---> {tccid.decode()}") s2wx("","",f"匹配到在线终端, 数据发送成功。 \n{sccid.decode()} ---> {tccid.decode()}")
except Exception: except Exception:
@ -428,7 +428,7 @@ def data_split(addr):
for i in range(len(dlist)): for i in range(len(dlist)):
flen = (dlist[i][5]<<8)+dlist[i][6] flen = (dlist[i][5]<<8)+dlist[i][6]
if flen != len(dlist[i]) : if flen != len(dlist[i]) :
logger.error("第{}数据帧不完整{}--{}",i+1,flen,len(dlist[i])) logger.warning("第{}数据帧不匹配，应收{}<-->实收{}",i+1,flen,len(dlist[i]))
# 清空缓存 # 清空缓存
recCache[addr].clear() recCache[addr].clear()
@ -436,7 +436,7 @@ def data_split(addr):
# 因为无帧尾，需添加帧是否完整的校验 # 因为无帧尾，需添加帧是否完整的校验
if len(dlist) : if len(dlist) :
# 目前情形多为两包粘包，故最后一包肯定不完整 # 目前情形多为两包粘包，故最后一包肯定不完整
logger.debug(bytes(dlist[-1]).hex(" ")) # logger.debug(bytes(dlist[-1]).hex(" "))
flen = (dlist[-1][5]<<8)+dlist[-1][6] flen = (dlist[-1][5]<<8)+dlist[-1][6]
if flen <= len(dlist[-1]) : if flen <= len(dlist[-1]) :
recCache[addr].extend(dlist[-1][flen:]) recCache[addr].extend(dlist[-1][flen:])
@ -512,7 +512,7 @@ class MyServer(socketserver.BaseRequestHandler):
add_timestamp() add_timestamp()
self.recDataBuff.extend(data) self.recDataBuff.extend(data)
# logger.debug("[R] {}",data.hex(" ")) # logger.debug("[R] {}",data.hex(" "))
s2f.save2file(data) s2f.save2file(f"[{get_ccid(conn).decode() if get_ccid(conn) else 'None'} --> SERVER][{len(data)}] {data.hex(' ')}")
t = f"从{str(self.client_address)}<->[{get_ccid(conn).decode() if get_ccid(conn) else 'None'}]接收到新数据，长度{len(data)}字节。" t = f"从{str(self.client_address)}<->[{get_ccid(conn).decode() if get_ccid(conn) else 'None'}]接收到新数据，长度{len(data)}字节。"
logger.info(t) logger.info(t)
logger.debug("[R] - {}",data.hex(" ")) logger.debug("[R] - {}",data.hex(" "))