update file montior pattern

XiaoMi · Oct 10, 2023 · 1432d97 · 1432d97
1 parent 58d0052
commit 1432d97
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/jcommon/file/src/main/java/com/xiaomi/mone/file/ozhera/HeraFileMonitor.java b/jcommon/file/src/main/java/com/xiaomi/mone/file/ozhera/HeraFileMonitor.java
@@ -79,11 +79,11 @@ public void reg(String path, Predicate<String> predicate) throws IOException, In
             WatchKey key = watchService.take();
             for (WatchEvent<?> event : key.pollEvents()) {
                 Path modifiedFile = (Path) event.context();
-                if (!predicate.test(modifiedFile.getFileName().toString()) || modifiedFile.getFileName().toString().startsWith(".")) {
+                String filePath = String.format("%s%s", path, modifiedFile.getFileName().toString());
+                if (!predicate.test(filePath) || modifiedFile.getFileName().toString().startsWith(".")) {
                     continue;
                 }
-                String filePath = path + modifiedFile.getFileName();
-                log.info(event.kind() + filePath);
+                log.debug("epoll result,path:{}", event.kind() + filePath);
                 HeraFile hfile = fileMap.get(filePath);
 
                 if (event.kind() == StandardWatchEventKinds.ENTRY_MODIFY) {

diff --git a/jcommon/file/src/test/java/com/xiaomi/mone/file/LogFileTest.java b/jcommon/file/src/test/java/com/xiaomi/mone/file/LogFileTest.java
@@ -74,9 +74,13 @@ public void testLogFileMonitor() {
         monitor.setListener(new DefaultMonitorListener(monitor, readEvent -> {
             System.out.println(readEvent.getReadResult().getLines());
         }));
-        String fileName = "/home/work/log/log-manager/.*.log";
+        String fileName = "/home/work/log/test/provider/server.log.*";
         Pattern pattern = Pattern.compile(fileName);
-        monitor.reg("/home/work/log/log-manager/", it -> true);
+        monitor.reg("/home/work/log/test/provider/", it -> {
+            boolean matches = pattern.matcher(it).matches();
+            log.info("file:{},matches:{}", it, matches);
+            return matches;
+        });
         log.info("reg finish");
         System.in.read();
     }