237899745/zsglpt
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🔇 减少定时任务调试日志输出

Browse Source 
- 移除每5秒的时间检查详细日志
- 移除星期/时间匹配的调试日志
- 移除账号ID类型和user_accounts内容的调试日志
- 保留关键的执行状态和错误日志

日志从45行减少到4行，降低服务器资源占用。

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
yuyx
2025-12-10 19:45:33 +08:00
parent 226d6724bd
commit 3e0bd4cf91
1 changed files with 4 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
app.py
View File

@@ -2866,9 +2866,6 @@ def scheduled_task_worker():
# 获取所有启用的用户定时任务 # 获取所有启用的用户定时任务
enabled_schedules = database.get_enabled_user_schedules() enabled_schedules = database.get_enabled_user_schedules()
if enabled_schedules:
print(f"[定时任务检查] 当前时间: {current_time}, 星期: {current_weekday}, 找到 {len(enabled_schedules)} 个启用的定时任务")
for schedule_config in enabled_schedules: for schedule_config in enabled_schedules:
schedule_time = schedule_config['schedule_time'].strip() schedule_time = schedule_config['schedule_time'].strip()
schedule_name = schedule_config.get('name', '未命名任务') schedule_name = schedule_config.get('name', '未命名任务')
@@ -2879,79 +2876,51 @@ def scheduled_task_worker():
h, m = schedule_time.split(':') h, m = schedule_time.split(':')
schedule_time = f"{int(h):02d}:{int(m):02d}" schedule_time = f"{int(h):02d}:{int(m):02d}"
print(f"[定时任务检查] 任务#{schedule_id} '{schedule_name}': 设定时间={schedule_time}, 当前时间={current_time}, 匹配={schedule_time == current_time}")
# 检查时间是否匹配 # 检查时间是否匹配
if schedule_time != current_time: if schedule_time != current_time:
print(f"[定时任务检查] 任务#{schedule_id} '{schedule_name}' 跳过: 时间不匹配 (设定:{schedule_time} vs 当前:{current_time})")
continue continue
print(f"[定时任务检查] 任务#{schedule_id} '{schedule_name}' 时间匹配，继续检查...")
# 检查星期是否匹配 # 检查星期是否匹配
weekdays_str = schedule_config.get('weekdays', '1,2,3,4,5') weekdays_str = schedule_config.get('weekdays', '1,2,3,4,5')
print(f"[定时任务检查] 任务#{schedule_id} '{schedule_name}' weekdays字段原始值: '{weekdays_str}'")
try: try:
allowed_weekdays = [int(d) for d in weekdays_str.split(',') if d.strip()] allowed_weekdays = [int(d) for d in weekdays_str.split(',') if d.strip()]
except Exception as e: except Exception as e:
print(f"[定时任务检查] 任务#{schedule_id} '{schedule_name}' 解析weekdays失败: {e}") print(f"[定时任务] 任务#{schedule_id} 解析weekdays失败: {e}")
continue continue
print(f"[定时任务检查] 任务#{schedule_id} '{schedule_name}' 允许星期: {allowed_weekdays}, 当前星期: {current_weekday} (1=周一,7=周日)")
if current_weekday not in allowed_weekdays: if current_weekday not in allowed_weekdays:
print(f"[定时任务检查] 任务#{schedule_id} '{schedule_name}' 跳过: 星期不匹配 ({current_weekday} not in {allowed_weekdays})")
continue continue
print(f"[定时任务检查] 任务#{schedule_id} '{schedule_name}' 星期匹配，继续检查...")
# 检查今天是否已经执行过（同一天同一时间只执行一次） # 检查今天是否已经执行过（同一天同一时间只执行一次）
last_run = schedule_config.get('last_run_at') last_run = schedule_config.get('last_run_at')
print(f"[定时任务检查] 任务#{schedule_id} '{schedule_name}' 最后执行时间: {last_run}")
if last_run: if last_run:
try: try:
last_run_datetime = datetime.strptime(last_run, '%Y-%m-%d %H:%M:%S') last_run_datetime = datetime.strptime(last_run, '%Y-%m-%d %H:%M:%S')
last_run_date = last_run_datetime.date() last_run_date = last_run_datetime.date()
last_run_time = last_run_datetime.strftime('%H:%M') last_run_time = last_run_datetime.strftime('%H:%M')
print(f"[定时任务检查] 任务#{schedule_id} '{schedule_name}' 最后执行: 日期={last_run_date}, 时间={last_run_time}")
print(f"[定时任务检查] 任务#{schedule_id} '{schedule_name}' 当前: 日期={now.date()}, 时间={current_time}")
# 检查是否在同一天的同一时间已执行过
if last_run_date == now.date() and last_run_time == schedule_time: if last_run_date == now.date() and last_run_time == schedule_time:
print(f"[定时任务检查] 任务#{schedule_id} '{schedule_name}' 跳过: 今天此时间({schedule_time})已执行过")
continue continue
elif last_run_date == now.date() and last_run_time != schedule_time:
print(f"[定时任务检查] 任务#{schedule_id} '{schedule_name}' 提示: 今天已在{last_run_time}执行过，当前时间{schedule_time}可以再次执行")
except Exception as e: except Exception as e:
print(f"[定时任务检查] 任务#{schedule_id} '{schedule_name}' 解析last_run时间失败: {e}") pass # 解析失败则继续执行
print(f"[定时任务检查] ✅ 任务#{schedule_id} '{schedule_name}' 通过所有检查，准备执行！") print(f"[定时任务] 任务#{schedule_id} '{schedule_name}' 开始执行 (时间:{schedule_time})")
# 执行用户定时任务 # 执行用户定时任务
user_id = schedule_config['user_id'] user_id = schedule_config['user_id']
schedule_id = schedule_config['id'] schedule_id = schedule_config['id']
browse_type = schedule_config.get('browse_type', '应读') browse_type = schedule_config.get('browse_type', '应读')
enable_screenshot = schedule_config.get('enable_screenshot', 1) enable_screenshot = schedule_config.get('enable_screenshot', 1)
# 调试日志
print(f"[DEBUG] 定时任务 {schedule_config.get('name')}: enable_screenshot={enable_screenshot} (类型:{type(enable_screenshot).__name__})")
try: try:
account_ids_raw = schedule_config.get('account_ids', '[]') or '[]' account_ids_raw = schedule_config.get('account_ids', '[]') or '[]'
print(f"[定时任务检查] 任务#{schedule_id} '{schedule_name}' account_ids原始值: {account_ids_raw}")
account_ids = json.loads(account_ids_raw) account_ids = json.loads(account_ids_raw)
print(f"[定时任务检查] 任务#{schedule_id} '{schedule_name}' 解析后account_ids: {account_ids}, 共{len(account_ids)}个账号")
except Exception as e: except Exception as e:
print(f"[定时任务检查] 任务#{schedule_id} '{schedule_name}' 解析account_ids失败: {e}") print(f"[定时任务] 任务#{schedule_id} 解析account_ids失败: {e}")
account_ids = [] account_ids = []
if not account_ids: if not account_ids:
print(f"[定时任务检查] 任务#{schedule_id} '{schedule_name}' 跳过: 未配置账号")
continue continue
print(f"[用户定时任务] 用户 {schedule_config.get('user_username', user_id)} 的任务 '{schedule_config.get('name', '')}' 开始执行")
# 创建执行日志 # 创建执行日志
import time as time_mod import time as time_mod
execution_start_time = time_mod.time() execution_start_time = time_mod.time()
@@ -2963,26 +2932,16 @@ def scheduled_task_worker():
started_count = 0 started_count = 0
skipped_count = 0 skipped_count = 0
print(f"[定时任务检查] 任务#{schedule_id} 准备启动{len(account_ids)}个账号")
print(f"[定时任务检查] user_accounts中的用户: {list(user_accounts.keys())}")
if user_id in user_accounts:
print(f"[定时任务检查] 用户{user_id}的账号: {list(user_accounts[user_id].keys())}")
else:
print(f"[定时任务检查] ⚠️ 用户{user_id}不在user_accounts中！")
for account_id in account_ids: for account_id in account_ids:
print(f"[定时任务检查] 检查账号 {account_id} (类型: {type(account_id)})")
if user_id not in user_accounts: if user_id not in user_accounts:
print(f"[定时任务检查] 跳过账号{account_id}: 用户{user_id}不在user_accounts中")
skipped_count += 1 skipped_count += 1
continue continue
if account_id not in user_accounts[user_id]: if account_id not in user_accounts[user_id]:
print(f"[定时任务检查] 跳过账号{account_id}: 账号不在user_accounts[{user_id}]中")
skipped_count += 1 skipped_count += 1
continue continue
account = user_accounts[user_id][account_id] account = user_accounts[user_id][account_id]
if account.is_running: if account.is_running:
print(f"[定时任务检查] 跳过账号{account_id}: 账号正在运行中")
skipped_count += 1 skipped_count += 1
continue continue