PaiGramTeam/MibooGram
3
0
Fork 0
mirror of https://github.com/PaiGramTeam/MibooGram.git synced 2024-11-16 12:51:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

✨ Raise SystemExit exception after core initialization error to shut down the app

Browse Source
This commit is contained in:
洛水居室 2022-11-25 18:02:18 +08:00 committed by GitHub
parent bcf9d8bfec
commit 40e3ab0cce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
core/base/aiobrowser.py
View File

@ -1,6 +1,6 @@
from typing import Optional
from playwright.async_api import Browser, Playwright, async_playwright
from playwright.async_api import Browser, Playwright, async_playwright, Error
from core.service import Service
from utils.log import logger
@ -22,8 +22,15 @@ class AioBrowser(Service):
try:
self.browser = await self._playwright.chromium.launch(timeout=5000)
logger.success("[blue]Browser[/] 启动成功", extra={"markup": True})
except TimeoutError as err:
logger.warning("[blue]Browser[/] 启动失败", extra={"markup": True})
except Error as err:
if "playwright install" in str(err):
logger.error(
"检查到 [blue]playwright[/] 刚刚安装或者未升级\n"
"请运行以下命令下载新浏览器\n"
"[blue bold]playwright install chromium[/]",
extra={"markup": True},
)
raise RuntimeError("检查到 playwright 刚刚安装或者未升级\n请运行以下命令下载新浏览器\nplaywright install chromium")
raise err
return self.browser

5
core/base/mysql.py
View File

@ -18,9 +18,8 @@ class MySQL(Service):
self.user = username
self.port = port
self.host = host
self.engine = create_async_engine(
f"mysql+asyncmy://{self.user}:{self.password}@{self.host}:{self.port}/{self.database}"
)
self.url = f"mysql+asyncmy://{self.user}:{self.password}@{self.host}:{self.port}/{self.database}"
self.engine = create_async_engine(self.url)
self.Session = sessionmaker(bind=self.engine, class_=AsyncSession)
async def get_session(self):

17
core/base/redisdb.py
View File

@ -2,6 +2,7 @@ import asyncio
import fakeredis.aioredis
from redis import asyncio as aioredis
from redis.exceptions import ConnectionError as RedisConnectionError, TimeoutError as RedisTimeoutError
from typing_extensions import Self
from core.config import BotConfig
@ -27,18 +28,22 @@ class RedisDB(Service):
logger.info("连接 [red]Redis[/] 失败", extra={"markup": True})
raise RuntimeError("连接 Redis 失败")
async def start_fake_redis(self):
self.client = fakeredis.aioredis.FakeRedis()
await self.ping()
async def start(self): # pylint: disable=W0221
if self._loop is None:
self._loop = asyncio.get_running_loop()
logger.info("正在尝试建立与 [red]Redis[/] 连接", extra={"markup": True})
try:
await self.ping()
except (KeyboardInterrupt, SystemExit):
pass
except Exception as exc:
logger.exception("尝试连接 [red]Redis[/] 失败，使用 [red]fakeredis[/] 模拟", exc_info=exc, extra={"markup": True})
self.client = fakeredis.aioredis.FakeRedis()
await self.ping()
except (RedisTimeoutError, RedisConnectionError) as exc:
if isinstance(exc, RedisTimeoutError):
logger.warning("连接 [red]Redis[/] 超时，使用 [red]fakeredis[/] 模拟", extra={"markup": True})
if isinstance(exc, RedisConnectionError):
logger.warning("连接 [red]Redis[/] 失败，使用 [red]fakeredis[/] 模拟", extra={"markup": True})
await self.start_fake_redis()
async def stop(self): # pylint: disable=W0221
await self.client.close()

4
core/bot.py
View File

@ -182,9 +182,9 @@ class Bot:
await instance.start()
logger.success(f'服务 "{base_service_cls.__name__}" 初始化成功')
self._services.update({base_service_cls: instance})
except Exception as e: # pylint: disable=W0703
except Exception as e:
logger.exception(f'服务 "{base_service_cls.__name__}" 初始化失败: {e}')
continue
raise SystemExit from e
async def start_services(self):
"""启动服务"""