Author: grobmeier
Date: Thu May 27 05:21:31 2010
New Revision: 948675
URL: http://svn.apache.org/viewvc?rev=948675&view=rev
Log:
LOG4PHP-112: Logging ClassName doesn't work. Added patch from darja, committed
slightly modified together with new test case. Fixes C conversion pattern
Modified:
logging/log4php/trunk/src/changes/changes.xml
logging/log4php/trunk/src/main/php/helpers/LoggerLocationPatternConverter.php
logging/log4php/trunk/src/main/php/helpers/LoggerPatternParser.php
logging/log4php/trunk/src/test/php/layouts/LoggerLayoutPatternTest.php
Modified: logging/log4php/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/logging/log4php/trunk/src/changes/changes.xml?rev=948675&r1=948674&r2=948675&view=diff
==============================================================================
--- logging/log4php/trunk/src/changes/changes.xml (original)
+++ logging/log4php/trunk/src/changes/changes.xml Thu May 27 05:21:31 2010
@@ -24,6 +24,7 @@
</properties>
<body>
<release version="2.1" description="Stabilizing">
+ <action type="fix" issue="LOG4PHP-112" by="darja, Christian
Grobmeier">Logging ClassName doesn't work</action>
<action type="update" issue="LOG4PHP-109" by="Vladimir
Gorej">patch for Throwable information associated with logging event</action>
<action type="update" issue="LOG4PHP-111" by="Ivan
Habunek">Documentation: Problem using a custom ConversionPattern</action>
<action type="update" issue="LOG4PHP-108" by="Florian Platzer,
Christian Grobmeier, Ivan Habunek">Add HTML line break to LoggerAppenderEcho
output</action>
Modified:
logging/log4php/trunk/src/main/php/helpers/LoggerLocationPatternConverter.php
URL:
http://svn.apache.org/viewvc/logging/log4php/trunk/src/main/php/helpers/LoggerLocationPatternConverter.php?rev=948675&r1=948674&r2=948675&view=diff
==============================================================================
---
logging/log4php/trunk/src/main/php/helpers/LoggerLocationPatternConverter.php
(original)
+++
logging/log4php/trunk/src/main/php/helpers/LoggerLocationPatternConverter.php
Thu May 27 05:21:31 2010
@@ -55,6 +55,8 @@ class LoggerLocationPatternConverter ext
return $locationInfo->getLineNumber();
case LoggerPatternParser::FILE_LOCATION_CONVERTER:
return $locationInfo->getFileName();
+ case LoggerPatternParser::CLASS_LOCATION_CONVERTER:
+ return
$locationInfo->getFullQualifiedClassname();
default:
return '';
}
Modified: logging/log4php/trunk/src/main/php/helpers/LoggerPatternParser.php
URL:
http://svn.apache.org/viewvc/logging/log4php/trunk/src/main/php/helpers/LoggerPatternParser.php?rev=948675&r1=948674&r2=948675&view=diff
==============================================================================
--- logging/log4php/trunk/src/main/php/helpers/LoggerPatternParser.php
(original)
+++ logging/log4php/trunk/src/main/php/helpers/LoggerPatternParser.php Thu May
27 05:21:31 2010
@@ -245,7 +245,7 @@ class LoggerPatternParser {
$this->currentLiteral = '';
break;
case 'C':
- $pc = new
LoggerClassNamePatternConverter($this->formattingInfo,
$this->extractPrecisionOption());
+ $pc = new
LoggerClassNamePatternConverter($this->formattingInfo,
self::CLASS_LOCATION_CONVERTER);
$this->currentLiteral = '';
break;
case 'd':
Modified: logging/log4php/trunk/src/test/php/layouts/LoggerLayoutPatternTest.php
URL:
http://svn.apache.org/viewvc/logging/log4php/trunk/src/test/php/layouts/LoggerLayoutPatternTest.php?rev=948675&r1=948674&r2=948675&view=diff
==============================================================================
--- logging/log4php/trunk/src/test/php/layouts/LoggerLayoutPatternTest.php
(original)
+++ logging/log4php/trunk/src/test/php/layouts/LoggerLayoutPatternTest.php Thu
May 27 05:21:31 2010
@@ -34,7 +34,7 @@ class LoggerLayoutPatternTest extends PH
$v = $this->formatEvent($event, $this->pattern);
$dt = $this->getEventDateTime($event);
$e = "$dt ERROR TEST (LoggerLayoutXml): testmessage in NA at
NA".PHP_EOL;
- self::assertEquals($v, $e);
+ self::assertEquals($e, $v);
}
public function testWarnLayout() {
@@ -43,7 +43,7 @@ class LoggerLayoutPatternTest extends PH
$v = $this->formatEvent($event, $this->pattern);
$dt = $this->getEventDateTime($event);
$e = "$dt WARN TEST (LoggerLayoutXml): testmessage in NA at
NA".PHP_EOL;
- self::assertEquals($v, $e);
+ self::assertEquals($e, $v);
}
public function testInfoLayout() {
@@ -52,7 +52,7 @@ class LoggerLayoutPatternTest extends PH
$v = $this->formatEvent($event, $this->pattern);
$dt = $this->getEventDateTime($event);
$e = "$dt INFO TEST (LoggerLayoutXml): testmessage in NA at
NA".PHP_EOL;
- self::assertEquals($v, $e);
+ self::assertEquals($e, $v);
}
public function testDebugLayout() {
@@ -61,16 +61,27 @@ class LoggerLayoutPatternTest extends PH
$v = $this->formatEvent($event, $this->pattern);
$dt = $this->getEventDateTime($event);
$e = "$dt DEBUG TEST (LoggerLayoutXml): testmessage in NA at
NA".PHP_EOL;
- self::assertEquals($v, $e);
+ self::assertEquals($e, $v);
}
public function testTraceLayout() {
- $event = new LoggerLoggingEvent("LoggerLayoutXml", new
Logger("TEST"), LoggerLevel::getLevelTrace(), "testmessage");
+ $event = new LoggerLoggingEvent("LoggerLayoutXml2", new
Logger("TEST"), LoggerLevel::getLevelTrace(), "testmessage");
$v = $this->formatEvent($event, $this->pattern);
$dt = $this->getEventDateTime($event);
- $e = "$dt TRACE TEST (LoggerLayoutXml): testmessage in NA at
NA".PHP_EOL;
- self::assertEquals($v, $e);
+ $e = "$dt TRACE TEST (LoggerLayoutXml2): testmessage in NA at
NA".PHP_EOL;
+ self::assertEquals($e, $v);
+ }
+
+ public function testClassnamePattern() {
+ $event = new LoggerLoggingEvent("LoggerLayoutPatternTest", new
Logger("TEST"), LoggerLevel::getLevelError(), "testmessage");
+
+ $v = $this->formatEvent($event, '%C');
+
+ $dt = $this->getEventDateTime($event);
+ $e = "LoggerLayoutPatternTest";
+
+ self::assertEquals($e, $v);
}
/**
