From 411e231995bc07962a7693a9a936fb39f5810ad1 Mon Sep 17 00:00:00 2001 From: Harald Musum Date: Mon, 7 Dec 2020 14:11:17 +0100 Subject: Revert "Simplify symlink" --- .../main/java/com/yahoo/container/logging/LogFileHandler.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'container-accesslogging/src/main/java/com/yahoo/container/logging/LogFileHandler.java') diff --git a/container-accesslogging/src/main/java/com/yahoo/container/logging/LogFileHandler.java b/container-accesslogging/src/main/java/com/yahoo/container/logging/LogFileHandler.java index 75e9febc192..ab246a21a43 100644 --- a/container-accesslogging/src/main/java/com/yahoo/container/logging/LogFileHandler.java +++ b/container-accesslogging/src/main/java/com/yahoo/container/logging/LogFileHandler.java @@ -298,7 +298,14 @@ public class LogFileHandler extends StreamHandler { if (symlinkName == null) return; File f = new File(fileName); File f2 = new File(f.getParent(), symlinkName); - String [] cmd = new String[]{"/bin/ln", "-sf", f.getName(), f2.getPath()}; + String canonicalPath; + try { + canonicalPath = f.getCanonicalPath(); + } catch (IOException e) { + logger.warning("Got '" + e + "' while doing f.getCanonicalPath() on file '" + f.getPath() + "'."); + return; + } + String [] cmd = new String[]{"/bin/ln", "-sf", canonicalPath, f2.getPath()}; try { int retval = new ProcessExecuter().exec(cmd).getFirst(); // Detonator pattern: Think of all the fun we can have if ln isn't what we -- cgit v1.2.3