Return-Path: X-Original-To: apmail-logging-commits-archive@minotaur.apache.org Delivered-To: apmail-logging-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id CDAD69C33 for ; Sun, 4 Dec 2011 13:27:12 +0000 (UTC) Received: (qmail 53861 invoked by uid 500); 4 Dec 2011 13:27:12 -0000 Delivered-To: apmail-logging-commits-archive@logging.apache.org Received: (qmail 53840 invoked by uid 500); 4 Dec 2011 13:27:12 -0000 Mailing-List: contact commits-help@logging.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@logging.apache.org Delivered-To: mailing list commits@logging.apache.org Received: (qmail 53833 invoked by uid 99); 4 Dec 2011 13:27:12 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 04 Dec 2011 13:27:12 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 04 Dec 2011 13:27:09 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 610BF23888FD; Sun, 4 Dec 2011 13:26:47 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1210109 - in /logging/log4php/trunk/src: changes/changes.xml main/php/LoggerAppender.php test/php/LoggerAppenderTest.php Date: Sun, 04 Dec 2011 13:26:47 -0000 To: commits@logging.apache.org From: ihabunek@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111204132647.610BF23888FD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ihabunek Date: Sun Dec 4 13:26:46 2011 New Revision: 1210109 URL: http://svn.apache.org/viewvc?rev=1210109&view=rev Log: (empty) Modified: logging/log4php/trunk/src/changes/changes.xml logging/log4php/trunk/src/main/php/LoggerAppender.php logging/log4php/trunk/src/test/php/LoggerAppenderTest.php Modified: logging/log4php/trunk/src/changes/changes.xml URL: http://svn.apache.org/viewvc/logging/log4php/trunk/src/changes/changes.xml?rev=1210109&r1=1210108&r2=1210109&view=diff ============================================================================== --- logging/log4php/trunk/src/changes/changes.xml (original) +++ logging/log4php/trunk/src/changes/changes.xml Sun Dec 4 13:26:46 2011 @@ -21,6 +21,7 @@ + Appeneders should use a default layout is no layout is specified in configuration Created a new layout LoggerLayoutSerialized which formats events as serialized objects. Appenders do not close gracefully if a fatal error occurs. A rewrite of the configurator. Modified: logging/log4php/trunk/src/main/php/LoggerAppender.php URL: http://svn.apache.org/viewvc/logging/log4php/trunk/src/main/php/LoggerAppender.php?rev=1210109&r1=1210108&r2=1210109&view=diff ============================================================================== --- logging/log4php/trunk/src/main/php/LoggerAppender.php (original) +++ logging/log4php/trunk/src/main/php/LoggerAppender.php Sun Dec 4 13:26:46 2011 @@ -79,8 +79,23 @@ abstract class LoggerAppender { // Closes the appender on shutdown. Better than a destructor because // it will be called even if a fatal error occurs (destructor won't). register_shutdown_function(array($this, 'close')); + + if ($this->requiresLayout) { + $this->layout = $this->getDefaultLayout(); + } } - + + /** + * Returns the default layout for this appender. Can be overriden by + * derived appenders. + * + * @return LoggerLayout + */ + public function getDefaultLayout() + { + return new LoggerLayoutSimple(); + } + /** * Adds a filter to the end of the filter chain. * @param LoggerFilter $filter add a new LoggerFilter Modified: logging/log4php/trunk/src/test/php/LoggerAppenderTest.php URL: http://svn.apache.org/viewvc/logging/log4php/trunk/src/test/php/LoggerAppenderTest.php?rev=1210109&r1=1210108&r2=1210109&view=diff ============================================================================== --- logging/log4php/trunk/src/test/php/LoggerAppenderTest.php (original) +++ logging/log4php/trunk/src/test/php/LoggerAppenderTest.php Sun Dec 4 13:26:46 2011 @@ -146,4 +146,28 @@ class LoggerAppenderTest extends PHPUnit $nullfilter = $appender->getFilter(); self::assertNull($nullfilter); } + + public function testInstanciateWithLayout() { + $appender = new LoggerAppenderEcho("LoggerAppenderTest"); + + $expected = "LoggerLayoutSimple"; + $actual = $appender->getLayout(); + $this->assertInstanceof($expected, $actual); + } + + public function testOverwriteLayout() { + $layout = new LoggerLayoutSimple(); + $appender = new LoggerAppenderEcho("LoggerAppenderTest"); + $appender->setLayout($layout); + + $actual = $appender->getLayout(); + $this->assertEquals($layout, $actual); + } + + public function testRequiresNoLayout() { + $appender = new LoggerAppenderNull("LoggerAppenderTest"); + + $actual = $appender->getLayout(); + $this->assertNull($actual); + } }