ensure, that on any RuntimeException during event consumption the filesystem stays valid

Author: infeo

src/main/java/org/cryptomator/cryptofs/CryptoFileSystemModule.java

@@ -41,6 +41,13 @@ public Optional<FileStore> provideNativeFileStore(@PathToVault Path pathToVault)
 	@Provides
 	@CryptoFileSystemScoped
 	public Consumer<FilesystemEvent> provideFilesystemEventConsumer(CryptoFileSystemProperties fsProps) {
-		return (Consumer<FilesystemEvent>) fsProps.get(CryptoFileSystemProperties.PROPERTY_NOTIFY_METHOD);
+		var eventConsumer = fsProps.fsEventConsumner();
+		return event -> {
+			try {
+				eventConsumer.accept(event);
+			} catch (RuntimeException e) {
+				LOG.warn("Filesystem event consumer failed with exception when processing event {}", event, e);
+			}
+		};
 	}
 }

src/main/java/org/cryptomator/cryptofs/CryptoFileSystemProperties.java

@@ -164,6 +164,10 @@ int shorteningThreshold() {
 		return (int) get(PROPERTY_SHORTENING_THRESHOLD);
 	}
 
+	Consumer<FilesystemEvent> fsEventConsumner() {
+		return (Consumer<FilesystemEvent>) get(PROPERTY_NOTIFY_METHOD);
+	}
+
 	@Override
 	public Set<Entry<String, Object>> entrySet() {
 		return entries;

src/test/java/org/cryptomator/cryptofs/CryptoFileSystemModuleTest.java

@@ -0,0 +1,35 @@
+package org.cryptomator.cryptofs;
+
+import org.cryptomator.cryptofs.event.ConflictResolutionFailedEvent;
+import org.cryptomator.cryptofs.event.FilesystemEvent;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+
+import java.nio.file.Path;
+import java.util.function.Consumer;
+
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+public class CryptoFileSystemModuleTest {
+
+	CryptoFileSystemModule inTest = new CryptoFileSystemModule();
+
+	@Test
+	void testEventConsumerIsDecorated() {
+		var p = Mockito.mock(Path.class);
+		var event = new ConflictResolutionFailedEvent(p, p, new RuntimeException());
+		var eventConsumer = (Consumer<FilesystemEvent>) mock(Consumer.class);
+		doThrow(new RuntimeException("fail")).when(eventConsumer).accept(event);
+		var props = mock(CryptoFileSystemProperties.class);
+		when(props.fsEventConsumner()).thenReturn(eventConsumer);
+
+		var decoratedConsumer = inTest.provideFilesystemEventConsumer(props);
+		Assertions.assertDoesNotThrow(() -> decoratedConsumer.accept(event));
+		verify(eventConsumer).accept(event);
+	}
+
+}