wyj/starbot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: Modify waiting time for connection self-adaption

Browse Source
This commit is contained in:
LWR 2023-04-26 00:15:28 +08:00
parent 8a7f0822a0
commit cf8bb1621b
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
starbot/core/bot.py
View File

@ -101,10 +101,14 @@ class StarBot:
for up in self.__datasource.get_up_list():
try:
await up.connect()
await asyncio.sleep(0.2)
except LiveException as ex:
logger.error(ex.msg)
try:
await asyncio.wait_for(self.__datasource.wait_for_connects(), config.get("WAIT_FOR_ALL_CONNECTION_TIMEOUT"))
wait_time = config.get("WAIT_FOR_ALL_CONNECTION_TIMEOUT")
if wait_time == 0:
wait_time = len(self.__datasource.get_up_list()) // 5 * 2
await asyncio.wait_for(self.__datasource.wait_for_connects(), wait_time)
except asyncio.exceptions.TimeoutError:
logger.warning("等待连接所有直播间超时, 请检查是否存在未连接成功的直播间")

8
starbot/utils/config.py
View File

@ -39,8 +39,8 @@ SIMPLE_CONFIG = {
# 是否将日志同时输出到文件中
"LOG_TO_FILE": False,
# 成功连接所有主播直播间的最大等待时长，可使得日志输出顺序更加易读，一般无需修改此处，单位：秒
"WAIT_FOR_ALL_CONNECTION_TIMEOUT": 30,
# 成功连接所有主播直播间的最大等待时长，可使得日志输出顺序更加易读，一般无需修改此处，设置为 0 会自适应计算，单位：秒
"WAIT_FOR_ALL_CONNECTION_TIMEOUT": 0,
# 是否自动判断仅连接必要的直播间，即当某直播间的开播、下播、直播报告开关均未开启时，自动跳过连接直播间，以节省性能
"ONLY_CONNECT_NECESSARY_ROOM": False,
@ -141,8 +141,8 @@ FULL_CONFIG = {
# 是否将日志同时输出到文件中
"LOG_TO_FILE": False,
# 成功连接所有主播直播间的最大等待时长，可使得日志输出顺序更加易读，一般无需修改此处，单位：秒
"WAIT_FOR_ALL_CONNECTION_TIMEOUT": 30,
# 成功连接所有主播直播间的最大等待时长，可使得日志输出顺序更加易读，一般无需修改此处，设置为 0 会自适应计算，单位：秒
"WAIT_FOR_ALL_CONNECTION_TIMEOUT": 0,
# 是否自动判断仅连接必要的直播间，即当某直播间的开播、下播、直播报告开关均未开启时，自动跳过连接直播间，以节省性能
"ONLY_CONNECT_NECESSARY_ROOM": False,