operations/screenshot_service: print → logging
- 新增模块级 _svc_log(msg, level):统一走 logging,失败兜底 stdout - 全部 24 处 print 改为 _svc_log,保留消息中"[截图服务]"前缀以兼容历史搜索 - 默认 level=INFO,告警分级(WARNING/ERROR 等)后续再细化 回归:149 .py 全量编译通过;test_filter_logging / check_web_gui_config_sync 通过。 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
1 parent
49704834d8
commit
4557dfb306
1 file changed
+51
-24
@@ -17,6 +17,33 @@ from datetime import datetime
|
||||
from douyin.core import path_config
|
||||
from operations.screenshot_operations import ScreenshotOperations
|
||||
|
||||
import logging as _logging
|
||||
|
||||
# 模块级 logger:原代码用 print 输出截图服务日志,这里统一走 logging。
|
||||
# 保留消息中已有的"[截图服务]"前缀,避免改变历史搜索习惯。
|
||||
_LOGGER = _logging.getLogger("operations.screenshot_service")
|
||||
|
||||
|
||||
def _svc_log(msg: str, level: str = "INFO") -> None:
|
||||
"""统一截图服务日志出口;失败兜底 stdout 以避免静默丢失。"""
|
||||
try:
|
||||
lv = str(level or "INFO").upper()
|
||||
if lv == "ERROR":
|
||||
_LOGGER.error(str(msg))
|
||||
elif lv == "WARNING":
|
||||
_LOGGER.warning(str(msg))
|
||||
elif lv == "DEBUG":
|
||||
_LOGGER.debug(str(msg))
|
||||
else:
|
||||
_LOGGER.info(str(msg))
|
||||
except Exception:
|
||||
try:
|
||||
_svc_log(str(msg))
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
|
||||
|
||||
|
||||
class ScreenshotService:
|
||||
"""后台截图服务:持续截图,避免主流程等待"""
|
||||
@@ -68,7 +95,7 @@ class ScreenshotService:
|
||||
self._thread.start()
|
||||
self._last_screenshot_time = time.time() - self._cache_valid_duration - 1.0
|
||||
timetag = datetime.now().strftime("%H:%M:%S")
|
||||
print(f"[{timetag}] [截图服务] 已启动后台截图服务,设备: {device_id}, 间隔: {interval}秒")
|
||||
_svc_log(f"[{timetag}] [截图服务] 已启动后台截图服务,设备: {device_id}, 间隔: {interval}秒")
|
||||
|
||||
def stop(self):
|
||||
"""停止后台截图服务"""
|
||||
@@ -80,7 +107,7 @@ class ScreenshotService:
|
||||
if self._thread and self._thread.is_alive():
|
||||
self._thread.join(timeout=2.0)
|
||||
timetag = datetime.now().strftime("%H:%M:%S")
|
||||
print(f"[{timetag}] [截图服务] 已停止后台截图服务")
|
||||
_svc_log(f"[{timetag}] [截图服务] 已停止后台截图服务")
|
||||
|
||||
def _screenshot_loop(self):
|
||||
"""后台截图循环"""
|
||||
@@ -111,22 +138,22 @@ class ScreenshotService:
|
||||
if header == b'\x89PNG':
|
||||
self._last_screenshot_time = time.time()
|
||||
self._last_success = True
|
||||
print(f"[{timetag}] [截图服务] 后台截图完成 #{loop_count},耗时: {screenshot_elapsed:.0f}ms,文件大小: {file_size/1024:.1f}KB")
|
||||
_svc_log(f"[{timetag}] [截图服务] 后台截图完成 #{loop_count},耗时: {screenshot_elapsed:.0f}ms,文件大小: {file_size/1024:.1f}KB")
|
||||
else:
|
||||
self._last_success = False
|
||||
print(f"[{timetag}] [截图服务] 后台截图文件格式错误 #{loop_count},耗时: {screenshot_elapsed:.0f}ms")
|
||||
_svc_log(f"[{timetag}] [截图服务] 后台截图文件格式错误 #{loop_count},耗时: {screenshot_elapsed:.0f}ms")
|
||||
else:
|
||||
self._last_success = False
|
||||
print(f"[{timetag}] [截图服务] 后台截图文件太小 #{loop_count} ({file_size}B),耗时: {screenshot_elapsed:.0f}ms")
|
||||
_svc_log(f"[{timetag}] [截图服务] 后台截图文件太小 #{loop_count} ({file_size}B),耗时: {screenshot_elapsed:.0f}ms")
|
||||
except (OSError, IOError, ValueError) as e:
|
||||
self._last_success = False
|
||||
print(f"[{timetag}] [截图服务] 后台截图文件验证失败 #{loop_count}: {e},耗时: {screenshot_elapsed:.0f}ms")
|
||||
_svc_log(f"[{timetag}] [截图服务] 后台截图文件验证失败 #{loop_count}: {e},耗时: {screenshot_elapsed:.0f}ms")
|
||||
else:
|
||||
self._last_success = False
|
||||
print(f"[{timetag}] [截图服务] 后台截图文件不存在 #{loop_count},耗时: {screenshot_elapsed:.0f}ms")
|
||||
_svc_log(f"[{timetag}] [截图服务] 后台截图文件不存在 #{loop_count},耗时: {screenshot_elapsed:.0f}ms")
|
||||
else:
|
||||
self._last_success = False
|
||||
print(f"[{timetag}] [截图服务] 后台截图失败 #{loop_count},耗时: {screenshot_elapsed:.0f}ms")
|
||||
_svc_log(f"[{timetag}] [截图服务] 后台截图失败 #{loop_count},耗时: {screenshot_elapsed:.0f}ms")
|
||||
|
||||
# 等待间隔时间,确保不小于0.5秒
|
||||
remaining_interval = max(0.5, self._screenshot_interval - screenshot_elapsed / 1000)
|
||||
@@ -134,7 +161,7 @@ class ScreenshotService:
|
||||
except Exception as e:
|
||||
try:
|
||||
timetag = datetime.now().strftime("%H:%M:%S")
|
||||
print(f"[{timetag}] [截图服务] 后台截图异常: {e}")
|
||||
_svc_log(f"[{timetag}] [截图服务] 后台截图异常: {e}")
|
||||
import traceback
|
||||
traceback.print_exc()
|
||||
except Exception:
|
||||
@@ -156,7 +183,7 @@ class ScreenshotService:
|
||||
|
||||
# 如果设备ID不同,需要重新启动服务
|
||||
if self._current_device_id != device_id:
|
||||
print(f"[{timetag}] [截图服务] 设备ID变更,重新启动服务: {device_id}")
|
||||
_svc_log(f"[{timetag}] [截图服务] 设备ID变更,重新启动服务: {device_id}")
|
||||
self.start(device_id)
|
||||
# 等待第一次截图完成
|
||||
time.sleep(0.1)
|
||||
@@ -194,46 +221,46 @@ class ScreenshotService:
|
||||
footer = f.read(read_size)
|
||||
if b'IEND' in footer:
|
||||
elapsed = (time.time() - request_start) * 1000
|
||||
print(f"[{timetag}] [截图服务] [OK] 缓存命中,耗时: {elapsed:.1f}ms (距离上次截图: {time_since_last*1000:.0f}ms, 文件大小: {file_size/1024:.1f}KB)")
|
||||
_svc_log(f"[{timetag}] [截图服务] [OK] 缓存命中,耗时: {elapsed:.1f}ms (距离上次截图: {time_since_last*1000:.0f}ms, 文件大小: {file_size/1024:.1f}KB)")
|
||||
return True
|
||||
elif retry < 2:
|
||||
# 文件可能还在写入,等待一下
|
||||
time.sleep(0.1)
|
||||
continue
|
||||
else:
|
||||
print(f"[{timetag}] [截图服务] [WARN] 缓存文件不完整(文件尾验证失败),等待后台截图")
|
||||
_svc_log(f"[{timetag}] [截图服务] [WARN] 缓存文件不完整(文件尾验证失败),等待后台截图")
|
||||
except (OSError, IOError) as e:
|
||||
if retry < 2:
|
||||
time.sleep(0.1)
|
||||
continue
|
||||
else:
|
||||
print(f"[{timetag}] [截图服务] [WARN] 缓存文件读取失败: {e},等待后台截图")
|
||||
_svc_log(f"[{timetag}] [截图服务] [WARN] 缓存文件读取失败: {e},等待后台截图")
|
||||
else:
|
||||
print(f"[{timetag}] [截图服务] [WARN] 缓存文件格式错误,等待后台截图")
|
||||
_svc_log(f"[{timetag}] [截图服务] [WARN] 缓存文件格式错误,等待后台截图")
|
||||
break
|
||||
else:
|
||||
if retry < 2:
|
||||
time.sleep(0.05)
|
||||
continue
|
||||
else:
|
||||
print(f"[{timetag}] [截图服务] [WARN] 缓存文件太小 ({file_size}B),等待后台截图")
|
||||
_svc_log(f"[{timetag}] [截图服务] [WARN] 缓存文件太小 ({file_size}B),等待后台截图")
|
||||
except (OSError, IOError) as e:
|
||||
if retry < 2:
|
||||
time.sleep(0.05)
|
||||
continue
|
||||
else:
|
||||
print(f"[{timetag}] [截图服务] [WARN] 缓存文件检查失败: {e},等待后台截图")
|
||||
_svc_log(f"[{timetag}] [截图服务] [WARN] 缓存文件检查失败: {e},等待后台截图")
|
||||
except ValueError as e:
|
||||
print(f"[{timetag}] [截图服务] [WARN] 缓存文件检查异常: {e},等待后台截图")
|
||||
_svc_log(f"[{timetag}] [截图服务] [WARN] 缓存文件检查异常: {e},等待后台截图")
|
||||
break
|
||||
else:
|
||||
print(f"[{timetag}] [截图服务] [WARN] 缓存文件不存在,等待后台截图")
|
||||
_svc_log(f"[{timetag}] [截图服务] [WARN] 缓存文件不存在,等待后台截图")
|
||||
else:
|
||||
print(f"[{timetag}] [截图服务] [WARN] 缓存已过期 (距离上次: {time_since_last*1000:.0f}ms > {self._cache_valid_duration*1000:.0f}ms),等待后台截图")
|
||||
_svc_log(f"[{timetag}] [截图服务] [WARN] 缓存已过期 (距离上次: {time_since_last*1000:.0f}ms > {self._cache_valid_duration*1000:.0f}ms),等待后台截图")
|
||||
|
||||
# 缓存无效或强制刷新
|
||||
if force:
|
||||
print(f"[{timetag}] [截图服务] 🔄 强制刷新,忽略缓存")
|
||||
_svc_log(f"[{timetag}] [截图服务] 🔄 强制刷新,忽略缓存")
|
||||
|
||||
# 等待后台截图完成
|
||||
if self._running:
|
||||
@@ -244,7 +271,7 @@ class ScreenshotService:
|
||||
time_since_last_before_wait = 0
|
||||
elif time_since_last_before_wait > 86400:
|
||||
time_since_last_before_wait = 10.0
|
||||
print(f"[{timetag}] [截图服务] [WAIT] 缓存未命中,等待后台截图 (距离上次: {time_since_last_before_wait*1000:.0f}ms)")
|
||||
_svc_log(f"[{timetag}] [截图服务] [WAIT] 缓存未命中,等待后台截图 (距离上次: {time_since_last_before_wait*1000:.0f}ms)")
|
||||
|
||||
# 等待最多6秒,让后台线程完成截图(适应较慢的截图操作)
|
||||
max_wait_time = 6.0
|
||||
@@ -266,7 +293,7 @@ class ScreenshotService:
|
||||
wait_elapsed = (time.time() - wait_start) * 1000
|
||||
total_elapsed = (time.time() - request_start) * 1000
|
||||
status = "[OK]" if self._last_success else "[FAIL]"
|
||||
print(f"[{timetag}] [截图服务] {status} 后台截图完成,等待耗时: {wait_elapsed:.1f}ms,总耗时: {total_elapsed:.1f}ms,文件大小: {file_size/1024:.1f}KB")
|
||||
_svc_log(f"[{timetag}] [截图服务] {status} 后台截图完成,等待耗时: {wait_elapsed:.1f}ms,总耗时: {total_elapsed:.1f}ms,文件大小: {file_size/1024:.1f}KB")
|
||||
return self._last_success
|
||||
# 文件尾验证失败,继续等待
|
||||
# 文件太小或格式错误,继续等待
|
||||
@@ -277,7 +304,7 @@ class ScreenshotService:
|
||||
|
||||
# 等待超时
|
||||
wait_elapsed = (time.time() - wait_start) * 1000
|
||||
print(f"[{timetag}] [截图服务] [TIMEOUT] 等待超时 ({wait_elapsed:.1f}ms),回退到直接截图")
|
||||
_svc_log(f"[{timetag}] [截图服务] [TIMEOUT] 等待超时 ({wait_elapsed:.1f}ms),回退到直接截图")
|
||||
|
||||
# 如果后台服务未运行或等待超时,直接执行截图(禁用服务模式,避免递归)
|
||||
direct_start = time.time()
|
||||
@@ -285,7 +312,7 @@ class ScreenshotService:
|
||||
direct_elapsed = (time.time() - direct_start) * 1000
|
||||
total_elapsed = (time.time() - request_start) * 1000
|
||||
status = "[OK]" if result else "[FAIL]"
|
||||
print(f"[{timetag}] [截图服务] {status} 直接截图完成,耗时: {direct_elapsed:.0f}ms,总耗时: {total_elapsed:.1f}ms")
|
||||
_svc_log(f"[{timetag}] [截图服务] {status} 直接截图完成,耗时: {direct_elapsed:.0f}ms,总耗时: {total_elapsed:.1f}ms")
|
||||
return result
|
||||
|
||||
def is_running(self) -> bool:
|
||||
|
||||
Reference in new issue
Block a user