Author: ihabunek
Date: Tue Jul 27 13:48:26 2010
New Revision: 979698
URL: http://svn.apache.org/viewvc?rev=979698&view=rev
Log:
LOG4PHP-113: Milliseconds do not change when using LoggerLayoutPattern
Modified:
logging/log4php/trunk/src/changes/changes.xml
logging/log4php/trunk/src/main/php/helpers/LoggerDatePatternConverter.php
Modified: logging/log4php/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/logging/log4php/trunk/src/changes/changes.xml?rev=979698&r1=979697&r2=979698&view=diff
==============================================================================
--- logging/log4php/trunk/src/changes/changes.xml (original)
+++ logging/log4php/trunk/src/changes/changes.xml Tue Jul 27 13:48:26 2010
@@ -24,6 +24,7 @@
</properties>
<body>
<release version="2.1" description="Stabilizing">
+ <action type="fix" issue="LOG4PHP-113" by="Ivan
Habunek">Milliseconds do not change when using LoggerLayoutPattern</action>
<action type="fix" issue="LOG4PHP-115"
by="Vaceletm">Instanciate LoggerAppenderPDO by hand throw exception</action>
<action type="update" issue="LOG4PHP-36" by="Moritz
Schmidt">PHP Configurator: set remaining properties to appenders</action>
<action type="update" issue="LOG4PHP-110" by="Vladimir
Gorej">MongoDB: improved exception handling</action>
Modified:
logging/log4php/trunk/src/main/php/helpers/LoggerDatePatternConverter.php
URL:
http://svn.apache.org/viewvc/logging/log4php/trunk/src/main/php/helpers/LoggerDatePatternConverter.php?rev=979698&r1=979697&r2=979698&view=diff
==============================================================================
--- logging/log4php/trunk/src/main/php/helpers/LoggerDatePatternConverter.php
(original)
+++ logging/log4php/trunk/src/main/php/helpers/LoggerDatePatternConverter.php
Tue Jul 27 13:48:26 2010
@@ -47,7 +47,7 @@ class LoggerDatePatternConverter extends
public function convert($event) {
$timeStamp = $event->getTimeStamp();
$usecs = round(($timeStamp - (int)$timeStamp) * 1000);
- $this->df = preg_replace('/((?<!\\\\)(?:\\\\{2})*)u/', '${1}' .
sprintf('%03d', $usecs), $this->df);
- return date($this->df, $event->getTimeStamp());
+ $df = preg_replace('/((?<!\\\\)(?:\\\\{2})*)u/', '${1}' .
sprintf('%03d', $usecs), $this->df);
+ return date($df, $timeStamp);
}
}
