From 21f011d80c970003024bb1ac8c45daa3ee00e855 Mon Sep 17 00:00:00 2001
From: Alex ORLUC <alex.orluc@maarch.org>
Date: Mon, 29 May 2017 10:53:20 +0200
Subject: [PATCH] FIX #5595 revert log4php file default
---
.../maarch_entreprise/xml/log4php.xml.default | 33 -------------------
core/class/class_history.php | 2 +-
core/services/LogsAbstract.php | 2 +-
install/class/Class_Install.php | 2 +-
4 files changed, 3 insertions(+), 36 deletions(-)
delete mode 100644 apps/maarch_entreprise/xml/log4php.xml.default
diff --git a/apps/maarch_entreprise/xml/log4php.xml.default b/apps/maarch_entreprise/xml/log4php.xml.default
deleted file mode 100644
index 772a18d34eb..00000000000
--- a/apps/maarch_entreprise/xml/log4php.xml.default
+++ /dev/null
@@ -1,33 +0,0 @@
-<log4php:configuration xmlns:log4php="http://logging.apache.org/log4php/"
- threshold="all" debug="false">
- <appender name="appenderFonctionnel" class="LoggerAppenderRollingFile">
- <layout class="LoggerLayoutTTCC" />
- <param name="file" value="./fonctionnel.log" />
- <param name="maxFileSize" value="10MB" />
- <param name="maxBackupIndex" value="10" />
- <layout class="LoggerLayoutPattern">
- <param name="ConversionPattern" value="[%d{d/m/Y H:i:s}] %-5p [%t] %m%n" />
- </layout>
- </appender>
- <appender name="appenderTechnique" class="LoggerAppenderRollingFile">
- <layout class="LoggerLayoutTTCC" />
- <param name="file" value="./technique.log" />
- <param name="maxFileSize" value="10MB" />
- <param name="maxBackupIndex" value="10" />
- <layout class="LoggerLayoutPattern">
- <param name="ConversionPattern" value="[%d{d/m/Y H:i:s}] %-5p [%t] %m%n" />
- </layout>
- </appender>
- <root>
- <level value="ERROR" />
- <appender_ref ref="fonctionnel,technique" />
- </root>
- <logger name="loggerFonctionnel" additivity="true">
- <level value="ERROR" />
- <appender_ref ref="appenderFonctionnel" />
- </logger>
- <logger name="loggerTechnique" additivity="true">
- <level value="ERROR" />
- <appender_ref ref="appenderTechnique" />
- </logger>
-</log4php:configuration>
diff --git a/core/class/class_history.php b/core/class/class_history.php
index 95d7b88a86b..6c3cc6ec28b 100644
--- a/core/class/class_history.php
+++ b/core/class/class_history.php
@@ -439,7 +439,7 @@ class history
$configFileLog4PHP = "apps"
. DIRECTORY_SEPARATOR . $_SESSION['config']['app_id']
. DIRECTORY_SEPARATOR . "xml"
- . DIRECTORY_SEPARATOR . "log4php.xml.default";
+ . DIRECTORY_SEPARATOR . "log4php.default.xml";
}
Logger::configure(
diff --git a/core/services/LogsAbstract.php b/core/services/LogsAbstract.php
index 36298874b39..1468c7de5e0 100644
--- a/core/services/LogsAbstract.php
+++ b/core/services/LogsAbstract.php
@@ -163,7 +163,7 @@ class Core_LogsAbstract_Service extends Core_Abstract_Service {
return 'apps'
. DIRECTORY_SEPARATOR . $_SESSION['config']['app_id']
. DIRECTORY_SEPARATOR . 'xml'
- . DIRECTORY_SEPARATOR . 'log4php.xml.default';
+ . DIRECTORY_SEPARATOR . 'log4php.default.xml';
}
protected static function format_message(array &$aArgs) {
diff --git a/install/class/Class_Install.php b/install/class/Class_Install.php
index 7db2891fd84..a5ee3268779 100755
--- a/install/class/Class_Install.php
+++ b/install/class/Class_Install.php
@@ -1167,7 +1167,7 @@ class Install extends functions
}
private function setLog4php(){
- $xmlconfig = simplexml_load_file('apps/maarch_entreprise/xml/log4php.xml.default');
+ $xmlconfig = simplexml_load_file('apps/maarch_entreprise/xml/log4php.default.xml');
$LOG4PHP = $xmlconfig->log4php;
$appender = $xmlconfig->appender;
$param = $appender->param;
--
GitLab