renil/lx-music-api-server
1
0
Fork 0
mirror of https://github.com/MeoProject/lx-music-api-server.git synced 2025-05-23 19:17:41 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: 优化端口监听逻辑，遇到某个端口监听错误时不重复监听

Browse Source
This commit is contained in:
helloplhm-qwq 2024-01-25 00:52:59 +08:00
parent e0f96333d0
commit f3b0a4d5a6
No known key found for this signature in database
GPG Key ID: B7542212855B2C26
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/variable.py
View File

@ -50,4 +50,5 @@ iscn = True
fake_ip = None fake_ip = None
aioSession = None aioSession = None
qdes_lib_loaded = False qdes_lib_loaded = False
use_cookie_pool = False use_cookie_pool = False
running_ports = []

26
main.py
View File

@ -153,7 +153,11 @@ if (config.read_config('common.allow_download_script')):
app.router.add_route('*', '/{tail:.*}', handle_404) app.router.add_route('*', '/{tail:.*}', handle_404)
async def run_app(): async def run_app():
retries = 0
while True: while True:
if (retries > 4):
logger.warning("重试次数已达上限，但仍有部分端口未能完成监听，已自动进行忽略")
return
try: try:
host = config.read_config('common.host') host = config.read_config('common.host')
ports = [int(port) for port in config.read_config('common.ports')] ports = [int(port) for port in config.read_config('common.ports')]
@ -162,10 +166,11 @@ async def run_app():
final_ssl_ports = [] final_ssl_ports = []
final_ports = [] final_ports = []
for p in ports: for p in ports:
if (p not in ssl_ports): if (p not in ssl_ports and p not in variable.running_ports):
final_ports.append(p) final_ports.append(p)
else: else:
final_ssl_ports.append(p) if (p not in variable.running_ports):
final_ssl_ports.append(p)
# 读取证书和私钥路径 # 读取证书和私钥路径
cert_path = config.read_config('common.ssl_info.path.cert') cert_path = config.read_config('common.ssl_info.path.cert')
privkey_path = config.read_config('common.ssl_info.path.privkey') privkey_path = config.read_config('common.ssl_info.path.privkey')
@ -176,9 +181,11 @@ async def run_app():
# 启动 HTTP 端口监听 # 启动 HTTP 端口监听
for port in final_ports: for port in final_ports:
http_site = aiohttp.web.TCPSite(http_runner, host, port) if (port not in variable.running_ports):
await http_site.start() http_site = aiohttp.web.TCPSite(http_runner, host, port)
logger.info(f"监听 -> http://{host}:{port}") await http_site.start()
variable.running_ports.append(port)
logger.info(f"监听 -> http://{host}:{port}")
if (config.read_config("common.ssl_info.enable") and final_ssl_ports != []): if (config.read_config("common.ssl_info.enable") and final_ssl_ports != []):
if (os.path.exists(cert_path) and os.path.exists(privkey_path)): if (os.path.exists(cert_path) and os.path.exists(privkey_path)):
@ -193,9 +200,11 @@ async def run_app():
# 启动 HTTPS 端口监听 # 启动 HTTPS 端口监听
for port in ssl_ports: for port in ssl_ports:
https_site = aiohttp.web.TCPSite(https_runner, host, port, ssl_context=ssl_context) if (port not in variable.running_ports):
await https_site.start() https_site = aiohttp.web.TCPSite(https_runner, host, port, ssl_context=ssl_context)
logger.info(f"监听 -> https://{host}:{port}") await https_site.start()
variable.running_ports.append(port)
logger.info(f"监听 -> https://{host}:{port}")
return return
except OSError as e: except OSError as e:
@ -204,6 +213,7 @@ async def run_app():
logger.info('服务器将在10s后再次尝试启动...') logger.info('服务器将在10s后再次尝试启动...')
await asyncio.sleep(10) await asyncio.sleep(10)
logger.info('重新尝试启动...') logger.info('重新尝试启动...')
retries += 1
else: else:
raise raise