Merge pull request #136 from zhangbin1010/dev

[Upgrade] 优化 log-server 代码
zhangbinhub · Dec 2, 2019 · 2946abb · 2946abb
2 parents b9a27bb + 9e898a2
commit 2946abb
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/cloud/log-server/src/main/kotlin/pers/acp/admin/log/schedule/LogFileBackUpTask.kt b/cloud/log-server/src/main/kotlin/pers/acp/admin/log/schedule/LogFileBackUpTask.kt
@@ -48,7 +48,7 @@ constructor(private val logAdapter: LogAdapter, private val logServerCustomerCon
                     if (!logFold.exists() || !logFold.isDirectory) {
                         throw ServerException("路径 $logFoldPath 不存在或不是文件夹")
                     }
-                    val files = logFold.listFiles { pathname -> pathname.name.contains(logFileDate) }
+                    val files = logFold.listFiles { pathname -> pathname.name.contains(logFileDate) && !pathname.name.endsWith(".tmp", true) }
                     if (files != null && files.isNotEmpty()) {
                         logAdapter.info(logFoldPath + " 路径下 " + logFileDate + " 的日志文件（或文件夹）共 " + files.size + " 个")
                         val fileNames: MutableList<String> = mutableListOf()