Merge pull request #136 from zhangbin1010/dev

zhangbinhub · web-flow · commit 2946abb3ca99 · 2019-12-01T20:11:53.000-06:00
[Upgrade] 优化 log-server 代码
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()

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ constructor(private val logAdapter: LogAdapter, private val logServerCustomerCon`
`48`	`48`	`if (!logFold.exists() \|\| !logFold.isDirectory) {`
`49`	`49`	`throw ServerException("路径 $logFoldPath 不存在或不是文件夹")`
`50`	`50`	`}`
`51`		`- val files = logFold.listFiles { pathname -> pathname.name.contains(logFileDate) }`
	`51`	`+ val files = logFold.listFiles { pathname -> pathname.name.contains(logFileDate) && !pathname.name.endsWith(".tmp", true) }`
`52`	`52`	`if (files != null && files.isNotEmpty()) {`
`53`	`53`	`logAdapter.info(logFoldPath + " 路径下 " + logFileDate + " 的日志文件（或文件夹）共 " + files.size + " 个")`
`54`	`54`	`val fileNames: MutableList<String> = mutableListOf()`