use nio Files when runtime provider is not Android

tinylog-org · Jun 14, 2020 · 40d8d85 · 40d8d85
1 parent 29e236c
commit 40d8d85
Showing 1 changed file with 17 additions and 20 deletions.
diff --git a/tinylog-impl/src/main/java/org/tinylog/writers/RollingFileWriter.java b/tinylog-impl/src/main/java/org/tinylog/writers/RollingFileWriter.java
@@ -17,6 +17,7 @@
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.nio.charset.Charset;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -76,7 +77,7 @@ public RollingFileWriter(final Map<String, String> properties) throws FileNotFou
 		backups = properties.containsKey("backups") ? Integer.parseInt(properties.get("backups")) : -1;
 		linkToLatest = properties.containsKey("latest") ? new DynamicPath(properties.get("latest")) : null;
 
-		List<File> files = removeLinkToLatest(path.getAllFiles());
+		List<File> files = filterOutSymlinks(path.getAllFiles());
 
 		String fileName;
 		boolean append;
@@ -102,17 +103,15 @@ public RollingFileWriter(final Map<String, String> properties) throws FileNotFou
 		writer = createByteArrayWriterAndLinkLatest(fileName, append, buffered, false, false);
 	}
 
-	private List<File> removeLinkToLatest(final List<File> files) {
-		if (linkToLatest != null) {
-			String linkToLatestAbsolutePath = linkToLatest.resolve();
-			List<File> symlink = new ArrayList<File>();
+	private static List<File> filterOutSymlinks(final List<File> files) {
+		if (!RuntimeProvider.isAndroid()) {
+			List<File> symlinks = new ArrayList<File>();
 			for (File file : files) {
-				if (file.getAbsolutePath().equals(linkToLatestAbsolutePath)) {
-					symlink.add(file);
-					break;
+				if (java.nio.file.Files.isSymbolicLink(file.toPath())) {
+					symlinks.add(file);
 				}
 			}
-			files.removeAll(symlink);
+			files.removeAll(symlinks);
 		}
 		return files;
 	}
@@ -121,18 +120,16 @@ private ByteArrayWriter createByteArrayWriterAndLinkLatest(final String fileName
 		final boolean threadSafe, final boolean shared) throws FileNotFoundException {
 		ByteArrayWriter writer = AbstractFormatPatternWriter.createByteArrayWriter(fileName, append, buffered, threadSafe, shared);
 		if (linkToLatest != null) {
-			String logFile = new File(fileName).getAbsolutePath();
-			String linkFile = new File(linkToLatest.resolve()).getAbsolutePath();
-			try {
-				Process process = Runtime.getRuntime().exec(new String[]{"ln", "-sf", logFile, linkFile});
+			File logFile = new File(fileName);
+			File linkFile = new File(linkToLatest.resolve());
+			if (!RuntimeProvider.isAndroid()) {
 				try {
-					process.waitFor();
-				} catch (InterruptedException intEx) {
-					InternalLogger.log(Level.WARN, intEx, "Interrupted while creating symlink '" + linkFile + "'");
+					Path linkPath = linkFile.toPath();
+					java.nio.file.Files.delete(linkPath);
+					java.nio.file.Files.createSymbolicLink(linkPath, logFile.toPath());
+				} catch (IOException exception) {
+					InternalLogger.log(Level.ERROR, exception, "Failed to create symlink '" + linkFile + "'");
 				}
-				process.destroy();
-			} catch (IOException exception) {
-				InternalLogger.log(Level.ERROR, exception, "Failed to create symlink '" + linkFile + "'");
 			}
 		}
 		return writer;
@@ -184,7 +181,7 @@ private void internalWrite(final byte[] data) throws IOException {
 		if (!canBeContinued(data, policies)) {
 			writer.close();
 
-			List<File> existingFiles = removeLinkToLatest(path.getAllFiles());
+			List<File> existingFiles = filterOutSymlinks(path.getAllFiles());
 			deleteBackups(existingFiles, backups);
 
 			String fileName = path.resolve();