You've already forked FrameTour-RenderWorker
feat(tracing): 增强文件下载上传的日志记录和追踪功能
- 添加任务上下文信息到日志前缀,便于追踪具体任务 - 在跨度中增加文件源URL和上传URL的属性记录 - 将存储服务中的info级别日志调整为debug级别以减少冗余输出 - 添加文件访问地址的调试日志输出 - 优化根日志级别设置允许DEBUG日志流入处理器 - 修复重试失败后的错误日志格式问题
This commit is contained in:
@@ -86,7 +86,7 @@ def upload_file(url: str, file_path: str, max_retries: int = 5, timeout: int = 6
|
||||
|
||||
# 检查是否使用 rclone 上传
|
||||
if os.getenv("UPLOAD_METHOD") == "rclone":
|
||||
logger.info(f"Uploading to: {url}")
|
||||
logger.debug(f"Uploading to: {url}")
|
||||
result = _upload_with_rclone(url, file_path)
|
||||
if result:
|
||||
return True
|
||||
@@ -95,7 +95,7 @@ def upload_file(url: str, file_path: str, max_retries: int = 5, timeout: int = 6
|
||||
# 应用 HTTP_REPLACE_MAP 替换 URL
|
||||
http_url = _apply_http_replace_map(url)
|
||||
content_type = _get_content_type(file_path)
|
||||
logger.info(f"Uploading to: {http_url} (Content-Type: {content_type})")
|
||||
logger.debug(f"Uploading to: {http_url} (Content-Type: {content_type})")
|
||||
|
||||
retries = 0
|
||||
while retries < max_retries:
|
||||
@@ -152,7 +152,8 @@ def _upload_with_rclone(url: str, file_path: str) -> bool:
|
||||
return False
|
||||
|
||||
if new_url.startswith(("http://", "https://")):
|
||||
logger.warning(f"rclone upload skipped: URL still starts with http after replace: {new_url}")
|
||||
logger.warning("rclone upload skipped: URL still starts with http after replace")
|
||||
logger.debug(f"rclone upload skipped address: {new_url}")
|
||||
return False
|
||||
|
||||
cmd = [
|
||||
@@ -207,7 +208,7 @@ def download_file(
|
||||
logger.debug(f"File exists, skipping download: {file_path}")
|
||||
return True
|
||||
|
||||
logger.info(f"Downloading: {url}")
|
||||
logger.debug(f"Downloading: {url}")
|
||||
|
||||
# 确保目标目录存在
|
||||
file_dir = os.path.dirname(file_path)
|
||||
@@ -239,5 +240,6 @@ def download_file(
|
||||
retries += 1
|
||||
logger.warning(f"Download failed ({e}). Retrying {retries}/{max_retries}...")
|
||||
|
||||
logger.error(f"Download failed after {max_retries} retries: {url}")
|
||||
logger.error(f"Download failed after {max_retries} retries")
|
||||
logger.debug(f"Download failed source address: {url}")
|
||||
return False
|
||||
|
||||
Reference in New Issue
Block a user