Hass/xiaozhi-esp32-server
1
0
Fork 0
mirror of https://github.com/xinnan-tech/xiaozhi-esp32-server.git synced 2026-07-22 23:23:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

🦄 refactor(log): colorful log

Browse Source
This commit is contained in:
kalicyh
2025-02-18 00:07:19 +08:00
parent 921e3c2c75
commit 2acee60d73
32 changed files with 423 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files
manager/api/config.py
+12 -11
View File
@@ -1,13 +1,14 @@
import os
import yaml
import logging
from config.logger import setup_logging
from aiohttp import web
from core.utils.util import get_project_dir
from config.private_config import PrivateConfig
from manager.api.user_manager import UserManager # 添加导入
from core.utils.auth_code_gen import AuthCodeGenerator # 添加导入
logger = logging.getLogger(__name__)
TAG = __name__
logger = setup_logging()
class ConfigHandler:
def __init__(self, session_manager):
@@ -42,7 +43,7 @@ class ConfigHandler:
})
except Exception as e:
logger.error(f"Error getting module options: {str(e)}", exc_info=True)
logger.bind(tag=TAG).error(f"Error getting module options: {str(e)}", exc_info=True)
return web.json_response({
'success': False,
'message': '获取配置选项失败'
@@ -52,11 +53,11 @@ class ConfigHandler:
"""只返回用户绑定的设备配置"""
try:
username = request['username']
logger.info(f"Getting devices for user: {username}")
logger.bind(tag=TAG).info(f"Getting devices for user: {username}")
# 从用户管理器获取用户的设备列表
user_devices = await self.user_manager.get_user_devices(username)
logger.info(f"User {username} has devices: {user_devices}")
logger.bind(tag=TAG).info(f"User {username} has devices: {user_devices}")
# 读取所有配置
all_configs = {}
@@ -71,7 +72,7 @@ class ConfigHandler:
if device_id in user_devices
}
logger.info(f"Returning {len(user_configs)} device configs for user {username}")
logger.bind(tag=TAG).info(f"Returning {len(user_configs)} device configs for user {username}")
return web.json_response({
'success': True,
'data': user_configs,
@@ -79,7 +80,7 @@ class ConfigHandler:
})
except Exception as e:
logger.error(f"Error getting devices for user {request.get('username')}: {str(e)}", exc_info=True)
logger.bind(tag=TAG).error(f"Error getting devices for user {request.get('username')}: {str(e)}", exc_info=True)
return web.json_response({
'success': False,
'message': f'获取设备列表失败: {str(e)}'
@@ -101,7 +102,7 @@ class ConfigHandler:
'message': '无权操作此设备'
}, status=403)
logger.info(f"Device config updated: {device_id} :\n{config}")
logger.bind(tag=TAG).info(f"Device config updated: {device_id} :\n{config}")
if not device_id or not config:
return web.json_response({
'success': False,
@@ -128,7 +129,7 @@ class ConfigHandler:
})
except Exception as e:
logger.error(f"Error saving device config: {str(e)}", exc_info=True)
logger.bind(tag=TAG).error(f"Error saving device config: {str(e)}", exc_info=True)
return web.json_response({
'success': False,
'message': f'保存配置失败: {str(e)}'
@@ -163,7 +164,7 @@ class ConfigHandler:
})
except Exception as e:
logger.error(f"Error deleting device config: {str(e)}", exc_info=True)
logger.bind(tag=TAG).error(f"Error deleting device config: {str(e)}", exc_info=True)
return web.json_response({
'success': False,
'message': f'删除配置失败: {str(e)}'
@@ -219,7 +220,7 @@ class ConfigHandler:
}, status=500)
except Exception as e:
logger.error(f"Error binding device: {str(e)}", exc_info=True)
logger.bind(tag=TAG).error(f"Error binding device: {str(e)}", exc_info=True)
return web.json_response({
'success': False,
'message': f'绑定设备失败: {str(e)}'
manager/api/login.py
+6 -5
View File
@@ -1,8 +1,9 @@
import logging
from config.logger import setup_logging
from aiohttp import web
import datetime
logger = logging.getLogger(__name__)
TAG = __name__
logger = setup_logging()
class LoginHandler:
def __init__(self, user_manager, session_manager):
@@ -17,7 +18,7 @@ class LoginHandler:
password = data.get('password')
if not username or not password:
logger.warning(f"Login attempt with empty credentials from {request.remote}")
logger.bind(tag=TAG).warning(f"Login attempt with empty credentials from {request.remote}")
return web.json_response({
'success': False,
'message': '用户名和密码不能为空'
@@ -25,7 +26,7 @@ class LoginHandler:
stored_user = await self.user_manager.get_user(username)
if not stored_user or stored_user['password'] != self.user_manager.hash_password(password):
logger.warning(f"Failed login attempt for user {username} from {request.remote}")
logger.bind(tag=TAG).warning(f"Failed login attempt for user {username} from {request.remote}")
return web.json_response({
'success': False,
'message': '用户名或密码错误'
@@ -45,7 +46,7 @@ class LoginHandler:
})
except Exception as e:
logger.error(f"Login error: {str(e)}", exc_info=True)
logger.bind(tag=TAG).error(f"Login error: {str(e)}", exc_info=True)
return web.json_response({
'success': False,
'message': '登录失败，请稍后重试'
manager/api/prompt.py
+4 -4
View File
@@ -1,12 +1,12 @@
import logging
from config.logger import setup_logging
from aiohttp import web
from config.settings import update_config
from ruamel.yaml.scalarstring import PreservedScalarString
from manager.api.auth import verify_token
from manager.api.response import response_unauthorized, response_success, response_error
logger = logging.getLogger(__name__)
TAG = __name__
logger = setup_logging()
class PromptApi:
def __init__(self, config):
@@ -38,5 +38,5 @@ class PromptApi:
return response_success()
except Exception as e:
logger.error(f"Failed to update prompt: {e}")
logger.bind(tag=TAG).error(f"Failed to update prompt: {e}")
return response_error(str(e))
manager/api/register.py
+7 -7
View File
@@ -1,9 +1,9 @@
import logging
from config.logger import setup_logging
from aiohttp import web
import datetime
logger = logging.getLogger(__name__)
TAG = __name__
logger = setup_logging()
class RegisterHandler:
def __init__(self, user_manager):
@@ -17,7 +17,7 @@ class RegisterHandler:
password = data.get('password')
if not username or not password:
logger.warning(f"Registration attempt with empty credentials from {request.remote}")
logger.bind(tag=TAG).warning(f"Registration attempt with empty credentials from {request.remote}")
return web.json_response({
'success': False,
'message': '用户名和密码不能为空'
@@ -25,7 +25,7 @@ class RegisterHandler:
# 检查用户是否已存在
if await self.user_manager.get_user(username):
logger.warning(f"Registration attempt with existing username {username} from {request.remote}")
logger.bind(tag=TAG).warning(f"Registration attempt with existing username {username} from {request.remote}")
return web.json_response({
'success': False,
'message': '用户名已存在'
@@ -41,14 +41,14 @@ class RegisterHandler:
}
await self.user_manager.add_user(username, user_data)
logger.info(f"Successfully registered new user {username} from {request.remote}")
logger.bind(tag=TAG).info(f"Successfully registered new user {username} from {request.remote}")
return web.json_response({
'success': True,
'message': '注册成功'
})
except Exception as e:
logger.error(f"Register error: {str(e)}", exc_info=True)
logger.bind(tag=TAG).error(f"Register error: {str(e)}", exc_info=True)
return web.json_response({
'success': False,
'message': '注册失败，请稍后重试'
manager/api/user_manager.py
+15 -14
View File
@@ -1,11 +1,12 @@
import os
import yaml
import hashlib
import logging
from config.logger import setup_logging
from core.utils.util import get_project_dir
from core.utils.lock_manager import FileLockManager
logger = logging.getLogger(__name__)
TAG = __name__
logger = setup_logging()
class UserManager:
def __init__(self):
@@ -23,9 +24,9 @@ class UserManager:
with open(self.secrets_path, 'w', encoding='utf-8') as f:
yaml.dump(default_config, f)
os.chmod(self.secrets_path, 0o600)
logger.info("Created new .secrets.yaml file")
logger.bind(tag=TAG).info("Created new .secrets.yaml file")
except Exception as e:
logger.error(f"Failed to create .secrets.yaml: {e}")
logger.bind(tag=TAG).error(f"Failed to create .secrets.yaml: {e}")
raise
async def _load_user_data_internal(self):
@@ -34,9 +35,9 @@ class UserManager:
with open(self.secrets_path, 'r', encoding='utf-8') as f:
data = yaml.safe_load(f) or {'users': {}}
users = data['users']
logger.debug("Successfully loaded user data")
logger.bind(tag=TAG).debug("Successfully loaded user data")
except Exception as e:
logger.error(f"Failed to load user data: {e}")
logger.bind(tag=TAG).error(f"Failed to load user data: {e}")
users = {}
return users
@@ -50,7 +51,7 @@ class UserManager:
self.lock_manager.release_lock(self.secrets_path)
except Exception as e:
logger.error(f"Failed to load user data: {e}")
logger.bind(tag=TAG).error(f"Failed to load user data: {e}")
users = {}
return users
@@ -59,9 +60,9 @@ class UserManager:
try:
with open(self.secrets_path, 'w', encoding='utf-8') as f:
yaml.dump({'users': users}, f)
logger.debug("Successfully saved user data")
logger.bind(tag=TAG).debug("Successfully saved user data")
except Exception as e:
logger.error(f"Failed to save user data: {e}")
logger.bind(tag=TAG).error(f"Failed to save user data: {e}")
raise
async def save_user_data(self, users):
@@ -73,7 +74,7 @@ class UserManager:
finally:
self.lock_manager.release_lock(self.secrets_path)
except Exception as e:
logger.error(f"Failed to save user data: {e}")
logger.bind(tag=TAG).error(f"Failed to save user data: {e}")
raise
def hash_password(self, password):
@@ -103,7 +104,7 @@ class UserManager:
finally:
self.lock_manager.release_lock(self.secrets_path)
except Exception as e:
logger.error(f"Error adding user: {e}")
logger.bind(tag=TAG).error(f"Error adding user: {e}")
raise
async def update_user(self, username, data):
@@ -120,7 +121,7 @@ class UserManager:
finally:
self.lock_manager.release_lock(self.secrets_path)
except Exception as e:
logger.error(f"Error updating user: {e}")
logger.bind(tag=TAG).error(f"Error updating user: {e}")
return False
async def get_user_devices(self, username: str) -> list:
@@ -151,7 +152,7 @@ class UserManager:
finally:
self.lock_manager.release_lock(self.secrets_path)
except Exception as e:
logger.error(f"Error adding device: {e}")
logger.bind(tag=TAG).error(f"Error adding device: {e}")
return False
async def remove_device(self, username: str, device_id: str) -> bool:
@@ -170,5 +171,5 @@ class UserManager:
finally:
self.lock_manager.release_lock(self.secrets_path)
except Exception as e:
logger.error(f"Error removing device: {e}")
logger.bind(tag=TAG).error(f"Error removing device: {e}")
return False