demus/openhab-core
1
0
Fork 0
mirror of https://github.com/danieldemus/openhab-core.git synced 2026-07-29 12:34:22 +02:00
Code Issues 1 Packages Projects Releases Wiki Activity

Improve FolderObserver ignored paths handling (#3856)

Browse Source 
The FolderObserver needs to make sure that paths are properly handled for any parsers that are added at any moment by other threads during activation.

Fixes #3784
Fixes #3793

Signed-off-by: Wouter Born <github@maindrain.net>
This commit is contained in:
Wouter Born
2023-10-21 09:23:07 +02:00
committed by GitHub
parent 14f8490d1c
commit f2c20af944
1 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/internal/folder/FolderObserver.java
+19 -2
View File
@@ -75,6 +75,9 @@ public class FolderObserver implements WatchService.WatchEventListener {
/* set of file extensions for which we have parsers already registered */ /* set of file extensions for which we have parsers already registered */
private final Set<String> parsers = new HashSet<>(); private final Set<String> parsers = new HashSet<>();
/* set of file extensions for missing parsers during activation */
private final Set<String> missingParsers = new HashSet<>();
/* set of files that have been ignored due to a missing parser */ /* set of files that have been ignored due to a missing parser */
private final Set<Path> ignoredPaths = new HashSet<>(); private final Set<Path> ignoredPaths = new HashSet<>();
private final Map<String, Path> namePathMap = new HashMap<>(); private final Map<String, Path> namePathMap = new HashMap<>();
@@ -135,9 +138,20 @@ public class FolderObserver implements WatchService.WatchEventListener {
} }
watchService.registerListener(this, Path.of("")); watchService.registerListener(this, Path.of(""));
addModelsToRepo(); addModelsToRepo();
this.activated = true; this.activated = true;
logger.debug("{} has been activated", FolderObserver.class.getSimpleName()); logger.debug("{} has been activated", FolderObserver.class.getSimpleName());
// process ignored paths for missing parsers which were added during activation
for (String extension : missingParsers) {
if (parsers.contains(extension)) {
processIgnoredPaths(extension);
readyService.markReady(new ReadyMarker(READYMARKER_TYPE, extension));
logger.debug("Marked extension '{}' as ready", extension);
}
}
missingParsers.clear();
} }
@Deactivate @Deactivate
@@ -187,7 +201,7 @@ public class FolderObserver implements WatchService.WatchEventListener {
} }
for (String extension : validExtensions) { for (String extension : validExtensions) {
if (parsers.contains(extension)) { if (parsers.contains(extension) && !missingParsers.contains(extension)) {
readyService.markReady(new ReadyMarker(READYMARKER_TYPE, extension)); readyService.markReady(new ReadyMarker(READYMARKER_TYPE, extension));
logger.debug("Marked extension '{}' as ready", extension); logger.debug("Marked extension '{}' as ready", extension);
} }
@@ -243,8 +257,11 @@ public class FolderObserver implements WatchService.WatchEventListener {
} catch (IOException e) { } catch (IOException e) {
logger.warn("Error while opening file during update: {}", path.toAbsolutePath()); logger.warn("Error while opening file during update: {}", path.toAbsolutePath());
} }
} else { } else if (extension != null) {
ignoredPaths.add(path); ignoredPaths.add(path);
if (!activated) {
missingParsers.add(extension);
}
if (logger.isDebugEnabled()) { if (logger.isDebugEnabled()) {
logger.debug("Missing parser for '{}' extension, added ignored path: {}", extension, logger.debug("Missing parser for '{}' extension, added ignored path: {}", extension,
path.toAbsolutePath()); path.toAbsolutePath());