Merge pull request #109 from qq254963746/develop

FIX 文件句柄 BUG

Author: qq254963746

lts-core/src/main/java/com/lts/core/commons/file/FileLock.java

@@ -36,6 +36,7 @@ public FileLock(File file) {
      * 获得锁
      */
     public boolean tryLock() {
+        boolean success = false;
         try {
             Path path = Paths.get(file.getPath());
             if (channel != null && channel.isOpen()) {
@@ -44,17 +45,20 @@ public boolean tryLock() {
             channel = FileChannel.open(path, StandardOpenOption.WRITE, StandardOpenOption.READ);
             lock = channel.tryLock();
             if (lock != null) {
+                success = true;
                 return true;
             }
-        } catch (IOException e) {
-            if (channel != null) {
-                try {
-                    channel.close();
-                } catch (IOException e1) {
-                    LOGGER.error("file channel close failed.", e1);
+        } catch (Exception e) {
+            return false;
+        } finally {
+            if (!success) {
+                if (channel != null) {
+                    try {
+                        channel.close();
+                    } catch (IOException ignored) {
+                    }
                 }
             }
-            return false;
         }
         return false;
     }

lts-core/src/main/java/com/lts/core/failstore/AbstractFailStore.java

@@ -62,6 +62,7 @@ public List<FailStore> getDeadFailStores() {
                     }
                 } catch (Exception e) {
                     // ignore
+                    LOGGER.error(e.getMessage(), e);
                 }
             }
         }

lts-core/src/main/java/com/lts/core/support/RetryScheduler.java

@@ -243,11 +243,12 @@ public void run() {
                                 LOGGER.info("{} RetryScheduler, dead local files send success, size: {}, {}", name, values.size(), JSONUtils.toJSONString(values));
                                 store.delete(keys);
                             } else {
+                                store.close();
                                 break;
                             }
                             try {
                                 Thread.sleep(500);
-                            } catch (Exception e) {
+                            } catch (Exception ignored) {
                             }
                         }
                     }