From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 7 Feb 2018 21:13:04 +0000 (+0100)
Subject: Better manage log4j configuration
X-Git-Tag: argeo-commons-2.1.71~3
X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=ceeb09e94bee0d7bb5a12042744084f993249af1;p=lgpl%2Fargeo-commons.git

Better manage log4j configuration
---

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeLogger.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeLogger.java
index 045229ce1..116cf98ab 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeLogger.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/NodeLogger.java
@@ -16,6 +16,7 @@
 package org.argeo.cms.internal.kernel;
 
 import java.io.IOException;
+import java.net.URI;
 import java.nio.file.FileSystems;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -115,7 +116,11 @@ class NodeLogger implements ArgeoLogger, LogListener {
 					log4jConfiguration = log4jConfiguration.substring("file:".length());
 			}
 			try {
-				Path log4jconfigPath = Paths.get(log4jConfiguration);
+				Path log4jconfigPath;
+				if (log4jConfiguration.startsWith("file:"))
+					log4jconfigPath = Paths.get(new URI(log4jConfiguration));
+				else
+					log4jconfigPath = Paths.get(log4jConfiguration);
 				Thread log4jConfWatcher = new Log4jConfWatcherThread(log4jconfigPath);
 				log4jConfWatcher.start();
 			} catch (Exception e) {