Author: grobmeier
Date: Thu Apr 22 04:52:20 2010
New Revision: 936612
URL: http://svn.apache.org/viewvc?rev=936612&view=rev
Log:
LOG4PHP-108: Add HTML line break to LoggerAppenderEcho output (contributed by
Florian Platzer). Patch added slightly modified (fixed test, renamed property)
Added:
logging/log4php/trunk/src/test/php/configurators/test6.properties
Modified:
logging/log4php/trunk/src/changes/changes.xml
logging/log4php/trunk/src/main/php/appenders/LoggerAppenderEcho.php
logging/log4php/trunk/src/test/php/LoggerAppenderTest.php
logging/log4php/trunk/src/test/php/LoggerTest.php
logging/log4php/trunk/src/test/php/appenders/LoggerAppenderEchoTest.php
logging/log4php/trunk/src/test/php/configurators/LoggerConfiguratorIniTest.php
logging/log4php/trunk/src/test/php/renderers/LoggerRendererMapTest.php
Modified: logging/log4php/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/logging/log4php/trunk/src/changes/changes.xml?rev=936612&r1=936611&r2=936612&view=diff
==============================================================================
--- logging/log4php/trunk/src/changes/changes.xml (original)
+++ logging/log4php/trunk/src/changes/changes.xml Thu Apr 22 04:52:20 2010
@@ -24,6 +24,7 @@
</properties>
<body>
<release version="2.1" description="Stabilizing">
+ <action type="update" issue="LOG4PHP-108" by="Florian Platzer,
Christian Grobmeier">Add HTML line break to LoggerAppenderEcho output</action>
<action type="update" by="Ivan Habunek">Included new
LoggerLayoutPattern tests</action>
<action type="fix" issue="LOG4PHP-103" by="Moritz
Schmidt">Exception when using more than one LoggerAppenderFile</action>
<action type="fix" issue="LOG4PHP-102" by="Ivan
Habunek">LoggerLayoutPattern fails tests</action>
Modified: logging/log4php/trunk/src/main/php/appenders/LoggerAppenderEcho.php
URL:
http://svn.apache.org/viewvc/logging/log4php/trunk/src/main/php/appenders/LoggerAppenderEcho.php?rev=936612&r1=936611&r2=936612&view=diff
==============================================================================
--- logging/log4php/trunk/src/main/php/appenders/LoggerAppenderEcho.php
(original)
+++ logging/log4php/trunk/src/main/php/appenders/LoggerAppenderEcho.php Thu Apr
22 04:52:20 2010
@@ -43,6 +43,9 @@
class LoggerAppenderEcho extends LoggerAppender {
/** boolean used internally to mark first append */
private $firstAppend = true;
+
+ /** @var boolean type-safe (bool) (true: -1, 1, true; false: 0, false)
*/
+ private $htmlLineBreak = true;
public function __construct($name = '') {
parent::__construct($name);
@@ -62,6 +65,10 @@ class LoggerAppenderEcho extends LoggerA
if($this->closed != true) {
if(!$this->firstAppend) {
echo $this->layout->getFooter();
+
+ if($this->htmlLineBreak) {
+ echo '<br />';
+ }
}
}
$this->closed = true;
@@ -74,7 +81,19 @@ class LoggerAppenderEcho extends LoggerA
$this->firstAppend = false;
}
echo $this->layout->format($event);
+
+ if($this->htmlLineBreak) {
+ echo '<br />';
+ }
}
}
+
+ public function setHtmlLineBreak($value) {
+ $this->htmlLineBreak = LoggerOptionConverter::toBoolean($value,
true);
+ }
+
+ public function getHtmlLineBreak() {
+ return $this->htmlLineBreak;
+ }
}
Modified: logging/log4php/trunk/src/test/php/LoggerAppenderTest.php
URL:
http://svn.apache.org/viewvc/logging/log4php/trunk/src/test/php/LoggerAppenderTest.php?rev=936612&r1=936611&r2=936612&view=diff
==============================================================================
--- logging/log4php/trunk/src/test/php/LoggerAppenderTest.php (original)
+++ logging/log4php/trunk/src/test/php/LoggerAppenderTest.php Thu Apr 22
04:52:20 2010
@@ -40,7 +40,7 @@ class LoggerAppenderTest extends PHPUnit
$appender->doAppend($event);
$v = ob_get_contents();
ob_end_clean();
- $e = "FATAL - testmessage" . PHP_EOL;
+ $e = "FATAL - testmessage" . PHP_EOL. "<br />";
self::assertEquals($e, $v);
$event = new LoggerLoggingEvent("LoggerAppenderEchoTest", new
Logger("TEST"), LoggerLevel::getLevelError(), "testmessage");
@@ -48,7 +48,7 @@ class LoggerAppenderTest extends PHPUnit
$appender->doAppend($event);
$v = ob_get_contents();
ob_end_clean();
- $e = "ERROR - testmessage" . PHP_EOL;
+ $e = "ERROR - testmessage" . PHP_EOL. "<br />";
self::assertEquals($e, $v);
$event = new LoggerLoggingEvent("LoggerAppenderEchoTest", new
Logger("TEST"), LoggerLevel::getLevelWarn(), "testmessage");
@@ -56,7 +56,7 @@ class LoggerAppenderTest extends PHPUnit
$appender->doAppend($event);
$v = ob_get_contents();
ob_end_clean();
- $e = "WARN - testmessage" . PHP_EOL;
+ $e = "WARN - testmessage" . PHP_EOL. "<br />";
self::assertEquals($e, $v);
$event = new LoggerLoggingEvent("LoggerAppenderEchoTest", new
Logger("TEST"), LoggerLevel::getLevelInfo(), "testmessage");
Modified: logging/log4php/trunk/src/test/php/LoggerTest.php
URL:
http://svn.apache.org/viewvc/logging/log4php/trunk/src/test/php/LoggerTest.php?rev=936612&r1=936611&r2=936612&view=diff
==============================================================================
--- logging/log4php/trunk/src/test/php/LoggerTest.php (original)
+++ logging/log4php/trunk/src/test/php/LoggerTest.php Thu Apr 22 04:52:20 2010
@@ -65,11 +65,11 @@ class LoggerTest extends PHPUnit_Framewo
$v = ob_get_contents();
ob_end_clean();
- $e = 'INFO - this is an info'.PHP_EOL;
- $e .= 'WARN - this is a warning'.PHP_EOL;
- $e .= 'ERROR - this is an error'.PHP_EOL;
- $e .= 'DEBUG - this is a debug message'.PHP_EOL;
- $e .= 'FATAL - this is a fatal message'.PHP_EOL;
+ $e = 'INFO - this is an info'.PHP_EOL. "<br />";
+ $e .= 'WARN - this is a warning'.PHP_EOL. "<br />";
+ $e .= 'ERROR - this is an error'.PHP_EOL. "<br />";
+ $e .= 'DEBUG - this is a debug message'.PHP_EOL. "<br />";
+ $e .= 'FATAL - this is a fatal message'.PHP_EOL. "<br />";
self::assertEquals($v, $e);
}
Modified:
logging/log4php/trunk/src/test/php/appenders/LoggerAppenderEchoTest.php
URL:
http://svn.apache.org/viewvc/logging/log4php/trunk/src/test/php/appenders/LoggerAppenderEchoTest.php?rev=936612&r1=936611&r2=936612&view=diff
==============================================================================
--- logging/log4php/trunk/src/test/php/appenders/LoggerAppenderEchoTest.php
(original)
+++ logging/log4php/trunk/src/test/php/appenders/LoggerAppenderEchoTest.php Thu
Apr 22 04:52:20 2010
@@ -33,6 +33,23 @@ class LoggerAppenderEchoTest extends PHP
$appender->activateOptions();
$event = new LoggerLoggingEvent("LoggerAppenderEchoTest", new
Logger("TEST"), LoggerLevel::getLevelError(), "testmessage");
+ $expected = "ERROR - testmessage" . PHP_EOL . "<br />";
+ ob_start();
+ $appender->append($event);
+ $actual = ob_get_clean();
+
+ self::assertEquals($expected, $actual);
+ }
+
+ public function testEchoNoHtml() {
+ $appender = new LoggerAppenderEcho("myname ");
+
+ $appender->setHtmlLineBreak(false);
+ $layout = new LoggerLayoutSimple();
+ $appender->setLayout($layout);
+ $appender->activateOptions();
+ $event = new LoggerLoggingEvent("LoggerAppenderEchoTest", new
Logger("TEST"), LoggerLevel::getLevelError(), "testmessage");
+
$expected = "ERROR - testmessage" . PHP_EOL;
ob_start();
$appender->append($event);
Modified:
logging/log4php/trunk/src/test/php/configurators/LoggerConfiguratorIniTest.php
URL:
http://svn.apache.org/viewvc/logging/log4php/trunk/src/test/php/configurators/LoggerConfiguratorIniTest.php?rev=936612&r1=936611&r2=936612&view=diff
==============================================================================
---
logging/log4php/trunk/src/test/php/configurators/LoggerConfiguratorIniTest.php
(original)
+++
logging/log4php/trunk/src/test/php/configurators/LoggerConfiguratorIniTest.php
Thu Apr 22 04:52:20 2010
@@ -153,4 +153,17 @@ class LoggerConfiguratorIniTest extends
$this->assertTrue($l->getAppender('test51') instanceof
LoggerAppenderFile);
$this->assertTrue($l->getAppender('test51')->getLayout() instanceof
LoggerLayoutTTCC);
}
+
+ public function testConfigureNoHtmlBreak() {
+ Logger :: configure('configurators/test6.properties');
+ $root = Logger :: getRootLogger();
+ self :: assertEquals(LoggerLevel :: getLevelWarn(), $root->getLevel());
+ $appender = $root->getAppender("default");
+ self :: assertTrue($appender instanceof LoggerAppenderEcho);
+ $layout = $appender->getLayout();
+ self :: assertTrue($layout instanceof LoggerLayoutSimple);
+
+ self :: assertFalse($appender->getHtmlLineBreak());
+
+ }
}
\ No newline at end of file
Added: logging/log4php/trunk/src/test/php/configurators/test6.properties
URL:
http://svn.apache.org/viewvc/logging/log4php/trunk/src/test/php/configurators/test6.properties?rev=936612&view=auto
==============================================================================
--- logging/log4php/trunk/src/test/php/configurators/test6.properties (added)
+++ logging/log4php/trunk/src/test/php/configurators/test6.properties Thu Apr
22 04:52:20 2010
@@ -0,0 +1,24 @@
+; Licensed to the Apache Software Foundation (ASF) under one or more
+; contributor license agreements. See the NOTICE file distributed with
+; this work for additional information regarding copyright ownership.
+; The ASF licenses this file to You under the Apache License, Version 2.0
+; (the "License"); you may not use this file except in compliance with
+; the License. You may obtain a copy of the License at
+;
+; http://www.apache.org/licenses/LICENSE-2.0
+;
+; Unless required by applicable law or agreed to in writing, software
+; distributed under the License is distributed on an "AS IS" BASIS,
+; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+; See the License for the specific language governing permissions and
+; limitations under the License.
+;
+log4php.appender.default = LoggerAppenderEcho
+log4php.appender.default.htmlLineBreak = "false"
+log4php.appender.default.layout = LoggerLayoutSimple
+
+log4php.logger.tracer = TRACE, default
+log4php.additivity.tracer= "false"
+log4php.additivity.mylogger= "false"
+log4php.logger.mylogger = INFO, default
+log4php.rootLogger = WARN, default
Modified: logging/log4php/trunk/src/test/php/renderers/LoggerRendererMapTest.php
URL:
http://svn.apache.org/viewvc/logging/log4php/trunk/src/test/php/renderers/LoggerRendererMapTest.php?rev=936612&r1=936611&r2=936612&view=diff
==============================================================================
--- logging/log4php/trunk/src/test/php/renderers/LoggerRendererMapTest.php
(original)
+++ logging/log4php/trunk/src/test/php/renderers/LoggerRendererMapTest.php Thu
Apr 22 04:52:20 2010
@@ -79,6 +79,6 @@ class LoggerRendererMapTest extends PHPU
$v = ob_get_contents();
ob_end_clean();
- self::assertEquals("ERROR - test1,test2,test3" . PHP_EOL, $v);
+ self::assertEquals("ERROR - test1,test2,test3" . PHP_EOL. "<br />",
$v);
}
}
