Author: grobmeier
Date: Tue Feb 15 20:15:45 2011
New Revision: 1071033
URL: http://svn.apache.org/viewvc?rev=1071033&view=rev
Log:
LOG4PHP-118: Additivity cannot be disabled. Thanks for the patch to Craig
Marvelley
Modified:
logging/log4php/trunk/src/changes/changes.xml
logging/log4php/trunk/src/main/php/configurators/LoggerConfiguratorIni.php
Modified: logging/log4php/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/logging/log4php/trunk/src/changes/changes.xml?rev=1071033&r1=1071032&r2=1071033&view=diff
==============================================================================
--- logging/log4php/trunk/src/changes/changes.xml (original)
+++ logging/log4php/trunk/src/changes/changes.xml Tue Feb 15 20:15:45 2011
@@ -24,6 +24,7 @@
</properties>
<body>
<release version="2.1" description="Stabilizing">
+ <action type="fix" issue="LOG4PHP-118" by="Craig
Marvelley">Additivity cannot be disabled through log4php.properties ini
file.</action>
<action type="update" issue="LOG4PHP-110" by="Vladimir Gorej,
Christian Grobmeier">Added MongoDB appender</action>
<action type="fix" issue="LOG4PHP-131" by="Ivan Habunek">File
appenders parameters (removed overloading of setFile()).</action>
<action type="fix" issue="LOG4PHP-133" by="Dmitry
Katemirov,Ivan Habunek">PDO appender doesn't close connections</action>
Modified:
logging/log4php/trunk/src/main/php/configurators/LoggerConfiguratorIni.php
URL:
http://svn.apache.org/viewvc/logging/log4php/trunk/src/main/php/configurators/LoggerConfiguratorIni.php?rev=1071033&r1=1071032&r2=1071033&view=diff
==============================================================================
--- logging/log4php/trunk/src/main/php/configurators/LoggerConfiguratorIni.php
(original)
+++ logging/log4php/trunk/src/main/php/configurators/LoggerConfiguratorIni.php
Tue Feb 15 20:15:45 2011
@@ -366,12 +366,8 @@ class LoggerConfiguratorIni implements L
*/
private function parseAdditivityForLogger($props, Logger $cat,
$loggerName) {
$value =
LoggerOptionConverter::findAndSubst(self::ADDITIVITY_PREFIX . $loggerName,
$props);
-
- // touch additivity only if necessary
- if(!empty($value)) {
- $additivity = LoggerOptionConverter::toBoolean($value,
true);
- $cat->setAdditivity($additivity);
- }
+ $additivity = LoggerOptionConverter::toBoolean($value, true);
+ $cat->setAdditivity($additivity);
}
/**
