From 954e97ee239ce15d6ae94b89abd1058ba3426a37 Mon Sep 17 00:00:00 2001 From: yongyiduan Date: Thu, 23 Mar 2023 15:49:24 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=88=B6=E5=93=81=E5=BA=93=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E5=BD=92=E6=A1=A3=E7=9A=84=E7=AC=AC=E4=B8=89=E6=96=B9?= =?UTF-8?q?=E6=9E=84=E5=BB=BA=E6=9C=BA=E6=97=A5=E5=BF=97=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E4=BF=9D=E7=95=99=E8=87=B3=E6=8C=87=E5=AE=9A=E7=9B=AE=E5=BD=95?= =?UTF-8?q?=20#8391?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/tencent/devops/common/log/pojo/TaskBuildLogProperty.kt | 2 +- .../com/tencent/devops/worker/common/logger/LoggerService.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/backend/ci/core/log/api-log/src/main/kotlin/com/tencent/devops/common/log/pojo/TaskBuildLogProperty.kt b/src/backend/ci/core/log/api-log/src/main/kotlin/com/tencent/devops/common/log/pojo/TaskBuildLogProperty.kt index d4b848474d5..19dafedd2ad 100644 --- a/src/backend/ci/core/log/api-log/src/main/kotlin/com/tencent/devops/common/log/pojo/TaskBuildLogProperty.kt +++ b/src/backend/ci/core/log/api-log/src/main/kotlin/com/tencent/devops/common/log/pojo/TaskBuildLogProperty.kt @@ -37,7 +37,7 @@ data class TaskBuildLogProperty( @ApiModelProperty("日志文件子路径", required = true) val childPath: String, @ApiModelProperty("日志zip文件子路径", required = true) - val childZipPath: String, + val childZipPath: String?, @ApiModelProperty("日志文件句柄", required = true) val logFile: File, @ApiModelProperty("日志的存储模式", required = false) diff --git a/src/backend/ci/core/worker/worker-common/src/main/kotlin/com/tencent/devops/worker/common/logger/LoggerService.kt b/src/backend/ci/core/worker/worker-common/src/main/kotlin/com/tencent/devops/worker/common/logger/LoggerService.kt index 9340f38c390..cb199d6ea77 100644 --- a/src/backend/ci/core/worker/worker-common/src/main/kotlin/com/tencent/devops/worker/common/logger/LoggerService.kt +++ b/src/backend/ci/core/worker/worker-common/src/main/kotlin/com/tencent/devops/worker/common/logger/LoggerService.kt @@ -372,7 +372,7 @@ object LoggerService { ) { ArchiveUtils.archiveLogFile( file = zipLog, - destFullPath = property.childZipPath, + destFullPath = property.childZipPath!!, buildVariables = buildVariables!!, token = token )