This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 529dd05a9758c42969975ea1b0ad631f4bdbb7cb Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Sep 21 18:17:49 2016 +0200 Toujours générer le fichier de configuration des logs (et pas seulement en dev mode) (Fixes #8551) --- .../ObserveWebApplicationConfiguration.java | 31 +++++++++++----------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/application-web-configuration/src/main/java/fr/ird/observe/application/web/configuration/ObserveWebApplicationConfiguration.java b/application-web-configuration/src/main/java/fr/ird/observe/application/web/configuration/ObserveWebApplicationConfiguration.java index 99bd83f..9f3e3a6 100644 --- a/application-web-configuration/src/main/java/fr/ird/observe/application/web/configuration/ObserveWebApplicationConfiguration.java +++ b/application-web-configuration/src/main/java/fr/ird/observe/application/web/configuration/ObserveWebApplicationConfiguration.java @@ -128,7 +128,6 @@ public class ObserveWebApplicationConfiguration extends GeneratedObserveWebAppli File databasesConfigurationFile = getDatabasesConfigurationFile(); File usersConfigurationFile = getUsersConfigurationFile(); - File log4jConfigurationFile = getLog4jConfigurationFile(); if (isDevMode()) { @@ -159,20 +158,6 @@ public class ObserveWebApplicationConfiguration extends GeneratedObserveWebAppli } } - if (!log4jConfigurationFile.exists()) { - - // Generate a default log4jConfigurationFile - try { - CharSource charSource = Resources.asCharSource(getClass().getResource("/observeweb-log4j.conf"), Charsets.UTF_8); - String log4jFileContent = charSource.read(); - if (log.isInfoEnabled()) { - log.info("Generate a default log4jConfigurationFile for tests purpose only:\n" + log4jFileContent); - } - Files.write(log4jConfigurationFile.toPath(), log4jFileContent.getBytes()); - } catch (IOException e) { - throw new ObserveWebApplicationConfigurationInitException("Impossible de créer un fichier de log4j pour développement", e); - } - } } if (!databasesConfigurationFile.exists()) { @@ -183,6 +168,22 @@ public class ObserveWebApplicationConfiguration extends GeneratedObserveWebAppli throw new ObserveWebApplicationConfigurationInitException("Le fichier de configuration des utilisateurs n'existe pas : " + usersConfigurationFile); } + File log4jConfigurationFile = getLog4jConfigurationFile(); + if (!log4jConfigurationFile.exists()) { + + // Generate a default log4jConfigurationFile + try { + CharSource charSource = Resources.asCharSource(getClass().getResource("/observeweb-log4j.conf"), Charsets.UTF_8); + String log4jFileContent = charSource.read(); + if (log.isInfoEnabled()) { + log.info("Generate a default log4jConfigurationFile for tests purpose only:\n" + log4jFileContent); + } + Files.write(log4jConfigurationFile.toPath(), log4jFileContent.getBytes()); + } catch (IOException e) { + throw new ObserveWebApplicationConfigurationInitException("Impossible de créer un fichier de log4j pour développement", e); + } + } + initLog(); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.