From f6b5e9aec639fe279c5c5ab70f5c4e534ddc3b45 Mon Sep 17 00:00:00 2001 From: Kyomotoi Date: Sat, 18 Jun 2022 00:22:37 +0800 Subject: =?UTF-8?q?=F0=9F=92=A9=20=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ATRI/plugins/console/data_source.py | 2 +- ATRI/plugins/console/driver/api.py | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'ATRI/plugins/console') diff --git a/ATRI/plugins/console/data_source.py b/ATRI/plugins/console/data_source.py index f6bbf16..eb1ddd2 100644 --- a/ATRI/plugins/console/data_source.py +++ b/ATRI/plugins/console/data_source.py @@ -48,7 +48,7 @@ class Console(Service): try: with open(df, "w", encoding="utf-8") as w: w.write(json.dumps({})) - except WriteFileError: + except Exception: raise WriteFileError("Writing file: " + str(df) + " failed!") base_data: dict = json.loads(df.read_bytes()) diff --git a/ATRI/plugins/console/driver/api.py b/ATRI/plugins/console/driver/api.py index d83f98b..452d063 100644 --- a/ATRI/plugins/console/driver/api.py +++ b/ATRI/plugins/console/driver/api.py @@ -6,7 +6,7 @@ from pathlib import Path from datetime import datetime from ATRI.service import ServiceTools, SERVICES_DIR -from ATRI.exceptions import GetStatusError, ReadFileError, WriteFileError +from ATRI.exceptions import GetStatusError from ..models import PlatformRuntimeInfo, BotRuntimeInfo, ServiceInfo @@ -33,7 +33,7 @@ def get_processing_data() -> tuple: datetime.utcfromtimestamp(now).replace(microsecond=0) - datetime.utcfromtimestamp(b).replace(microsecond=0) ) - except GetStatusError: + except Exception: raise GetStatusError("Getting runtime failed.") if p_cpu > 90: # type: ignore @@ -97,7 +97,7 @@ def control_service( ) -> tuple: try: serv_data = ServiceTools().load_service(serv_name) - except ReadFileError: + except Exception: return False, dict() if is_enab != 1: @@ -128,7 +128,7 @@ def control_service( try: ServiceTools().save_service(serv_data, serv_name) - except WriteFileError: + except Exception: return False, dict() return True, serv_data @@ -187,7 +187,7 @@ def edit_block_list(is_enab: bool, user_id: str, group_id: str) -> tuple: path = MANEGE_DIR / g_f with open(path, "w", encoding="utf-8") as w: w.write(json.dumps(g_d)) - except WriteFileError: + except Exception: return False, dict() return True, {"user": u_d, "group": g_d} -- cgit v1.2.3