This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 5549f18ed86e09f97c17565822fa7c8343e7d904 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Aug 14 11:58:31 2015 +0200 Utilisation d'application config pour parser le fichier de log construit au chargement de l'application (refs #7456) --- .../src/main/java/fr/ird/observe/ObserveConfig.java | 5 +++++ .../src/main/java/fr/ird/observe/ObserveRunner.java | 15 ++++++++++++--- .../src/main/{filters => resources}/log4j.properties | 2 +- .../main/{filters => resources}/observe-log4j.properties | 2 +- 4 files changed, 19 insertions(+), 5 deletions(-) diff --git a/observe-swing/src/main/java/fr/ird/observe/ObserveConfig.java b/observe-swing/src/main/java/fr/ird/observe/ObserveConfig.java index 643a488..0302e1a 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ObserveConfig.java +++ b/observe-swing/src/main/java/fr/ird/observe/ObserveConfig.java @@ -1034,6 +1034,11 @@ public class ObserveConfig extends ApplicationConfig implements IObserveConfig { return longlinVesselTypeIds; } + @Override + public String replaceRecursiveOptions(String option) { + return super.replaceRecursiveOptions(option); + } + ////////////////////////////////////////////////// // Toutes les étapes d'actions ////////////////////////////////////////////////// diff --git a/observe-swing/src/main/java/fr/ird/observe/ObserveRunner.java b/observe-swing/src/main/java/fr/ird/observe/ObserveRunner.java index 3e11eea..5943996 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ObserveRunner.java +++ b/observe-swing/src/main/java/fr/ird/observe/ObserveRunner.java @@ -57,6 +57,7 @@ import java.net.URL; import java.util.Arrays; import java.util.Date; import java.util.Locale; +import java.util.Map; import java.util.Properties; import static fr.ird.observe.ObserveConfigOption.BACKUP_DIRECTORY; @@ -245,7 +246,7 @@ public abstract class ObserveRunner extends ApplicationRunner { } } - protected void initLog(ObserveConfig config) { + protected void initLog(ObserveConfig config) throws IOException { File logFile = config.getLogConfigurationFile(); Preconditions.checkState(logFile.exists(), "Le fichier de configuration des logs %s n'existe pas.", logFile); @@ -258,10 +259,18 @@ public abstract class ObserveRunner extends ApplicationRunner { } if (log.isInfoEnabled()) { - log.info("Chargement du fichier de de log4j depuis " + logFile); + log.info("Chargement du fichier de de log4j depuis " + resource); + } + Properties logConfigurationProperties = resourceManager.load(resource); + Properties finalLogConfigurationProperties = new Properties(); + for (Map.Entry<Object, Object> entry : logConfigurationProperties.entrySet()) { + String key = (String) entry.getKey(); + String value = (String) entry.getValue(); + String newValue = config.replaceRecursiveOptions(value); + finalLogConfigurationProperties.setProperty(key, newValue); } LogManager.resetConfiguration(); - PropertyConfigurator.configure(resource); + PropertyConfigurator.configure(finalLogConfigurationProperties); log = LogFactory.getLog(ObserveRunner.class); if (log.isInfoEnabled()) { diff --git a/observe-swing/src/main/filters/log4j.properties b/observe-swing/src/main/resources/log4j.properties similarity index 98% rename from observe-swing/src/main/filters/log4j.properties rename to observe-swing/src/main/resources/log4j.properties index 849c93f..d8bf027 100644 --- a/observe-swing/src/main/filters/log4j.properties +++ b/observe-swing/src/main/resources/log4j.properties @@ -30,7 +30,7 @@ log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%c:%L) %M - %m%n # file output... log4j.appender.file=org.apache.log4j.RollingFileAppender -log4j.appender.file.File=\${user.home}/.observe/log/observe-boot-${project.version}.log +log4j.appender.file.File=\${user.home}/.observe/log/observe-boot.log log4j.appender.file.MaxFileSize=10MB log4j.appender.file.MaxBackupIndex=4 log4j.appender.file.layout=org.apache.log4j.PatternLayout diff --git a/observe-swing/src/main/filters/observe-log4j.properties b/observe-swing/src/main/resources/observe-log4j.properties similarity index 95% rename from observe-swing/src/main/filters/observe-log4j.properties rename to observe-swing/src/main/resources/observe-log4j.properties index 88e89d2..d763f42 100644 --- a/observe-swing/src/main/filters/observe-log4j.properties +++ b/observe-swing/src/main/resources/observe-log4j.properties @@ -30,7 +30,7 @@ log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%c:%L) %M - %m%n # file output... log4j.appender.file=org.apache.log4j.RollingFileAppender -log4j.appender.file.File=\${user.home}/.observe/log/observe-${project.version}.log +log4j.appender.file.File=${data.directory}/log/observe-${application.version}.log log4j.appender.file.MaxFileSize=10MB log4j.appender.file.MaxBackupIndex=4 log4j.appender.file.layout=org.apache.log4j.PatternLayout -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.