Merge pull request #8533 from yongyiduan/issue_8391

feat: 制品库无法归档的第三方构建机日志支持保留至指定目录 #8391
TencentBlueKing · Mar 23, 2023 · a991d1e · a991d1e
2 parents 0626895 + 954e97e
commit a991d1e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...re/log/api-log/src/main/kotlin/com/tencent/devops/common/log/pojo/TaskBuildLogProperty.kt b/...re/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/...er/worker-common/src/main/kotlin/com/tencent/devops/worker/common/logger/LoggerService.kt b/...er/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
                         )