From c057275036cd3e28f2de146e5993c6f97016ffdb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 22 八月 2023 17:39:20 +0800
Subject: [PATCH] bug修改
---
middle_server.py | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/middle_server.py b/middle_server.py
index e81f66c..8ca0c26 100644
--- a/middle_server.py
+++ b/middle_server.py
@@ -13,6 +13,7 @@
import socket_manager
from db import mysql_data
from db.redis_manager import RedisUtils, RedisManager
+from log import logger_debug
from utils import socket_util, kpl_api_util, hosting_api_util, kp_client_msg_manager, global_data_cache_util
from utils.juejin_util import JueJinHttpApi
@@ -93,7 +94,6 @@
{"code": 100, "msg": f"JSON瑙ｆ瀽澶辫触"}).encode(
encoding='utf-8')))
continue
- print(data_json["type"])
if data_json["type"] == 'register':
client_type = data_json["data"]["client_type"]
rid = data_json["rid"]
@@ -109,9 +109,10 @@
# 璁板綍娲昏穬瀹㈡埛绔�
socket_manager.ClientSocketManager.heart(resultJSON['client_id'])
except json.decoder.JSONDecodeError as e:
+ print("JSON瑙ｆ瀽鍑洪敊", result, header)
if not result:
sk.close()
- print("JSON瑙ｆ瀽鍑洪敊", result, header)
+ break
time.sleep(1)
except ConnectionResetError as ee:
socket_manager.ClientSocketManager.del_client(rid)
@@ -153,7 +154,7 @@
redis = RedisManager(db).getRedis()
method = getattr(RedisUtils, cmd)
args_ = [redis, key]
- if args:
+ if args is not None:
if type(args) == tuple or type(args) == list:
args = list(args)
for a in args:
@@ -162,9 +163,13 @@
args_.append(args)
args_ = tuple(args_)
result = method(*args_)
+ if type(result) == set:
+ result = list(result)
result_str = json.dumps({"code": 0, "data": result})
sk.sendall(socket_util.load_header(result_str.encode(encoding='utf-8')))
except Exception as e:
+ logger_debug.exception(e)
+ logger_debug.info(f"Redis鎿嶄綔鍑洪敊锛歞ata_json锛歿data_json}")
logging.exception(e)
sk.sendall(socket_util.load_header(
json.dumps({"code": 1, "msg": str(e)}).encode(encoding='utf-8')))
@@ -185,7 +190,7 @@
args_.append(args)
args_ = tuple(args_)
result = method(*args_)
- result_str = json.dumps({"code": 0, "data": result})
+ result_str = json.dumps({"code": 0, "data": result}, default=str)
sk.sendall(socket_util.load_header(result_str.encode(encoding='utf-8')))
except Exception as e:
logging.exception(e)
@@ -228,6 +233,7 @@
result_str = json.dumps({"code": 0, "data": {}})
sk.sendall(socket_util.load_header(result_str.encode(encoding='utf-8')))
pass
+
else:
# 鏂紑杩炴帴
break
@@ -269,6 +275,7 @@
t1.start()
laddr = "0.0.0.0", 10008
+ print("MiddleServer is at: http://%s:%d/" % (laddr))
tcpserver = MyThreadingTCPServer(laddr, MyBaseRequestHandle) # 娉ㄦ剰锛氬弬鏁版槸MyBaseRequestHandle
tcpserver.serve_forever()
--
Gitblit v1.8.0