Author: grobmeier
Date: Tue May 5 04:07:49 2009
New Revision: 771547
URL: http://svn.apache.org/viewvc?rev=771547&view=rev
Log:
#LOG4PHP-40: Merged LoggerAppender with LoggerAppenderSkeleton - moved methods
around and replaced references to LoggerAppenderSkeleton
Modified:
incubator/log4php/trunk/src/main/php/LoggerAppender.php
incubator/log4php/trunk/src/main/php/LoggerAppenderSkeleton.php
incubator/log4php/trunk/src/main/php/LoggerManager.php
incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderAdodb.php
incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderConsole.php
incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderDailyFile.php
incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderDb.php
incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderEcho.php
incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderFile.php
incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderMail.php
incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderMailEvent.php
incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderNull.php
incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderPhp.php
incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderSocket.php
incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderSyslog.php
incubator/log4php/trunk/src/main/php/spi/LoggerFilter.php
incubator/log4php/trunk/src/main/php/varia/LoggerLevelRangeFilter.php
Modified: incubator/log4php/trunk/src/main/php/LoggerAppender.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/LoggerAppender.php?rev=771547&r1=771546&r2=771547&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/LoggerAppender.php (original)
+++ incubator/log4php/trunk/src/main/php/LoggerAppender.php Tue May 5 04:07:49
2009
@@ -26,6 +26,74 @@
* @package log4php
*/
abstract class LoggerAppender {
+
+ /**
+ * @var boolean closed appender flag
+ */
+ protected $closed = false;
+
+ /**
+ * @var object unused
+ */
+ protected $errorHandler;
+
+ /**
+ * The first filter in the filter chain
+ * @var LoggerFilter
+ */
+ protected $headFilter = null;
+
+ /**
+ * LoggerLayout for this appender. It can be null if appender has its
own layout
+ * @var LoggerLayout
+ */
+ protected $layout = null;
+
+ /**
+ * @var string Appender name
+ */
+ protected $name;
+
+ /**
+ * The last filter in the filter chain
+ * @var LoggerFilter
+ */
+ protected $tailFilter = null;
+
+ /**
+ * @var LoggerLevel There is no level threshold filtering by default.
+ */
+ protected $threshold = null;
+
+ /**
+ * @var boolean needs a layout formatting ?
+ */
+ protected $requiresLayout = false;
+
+ /**
+ * Constructor
+ *
+ * @param string $name appender name
+ */
+ public function __construct($name) {
+ $this->name = $name;
+ $this->clearFilters();
+ }
+
+ /**
+ * Add a filter to the end of the filter list.
+ *
+ * @param LoggerFilter $newFilter add a new LoggerFilter
+ */
+ public function addFilter($newFilter) {
+ if($this->headFilter === null) {
+ $this->headFilter = $newFilter;
+ $this->tailFilter = $this->headFilter;
+ } else {
+ $this->tailFilter->next = $newFilter;
+ $this->tailFilter = $this->tailFilter->next;
+ }
+ }
/**
* Factory
@@ -68,26 +136,64 @@
return null;
}
+
+ /**
+ * Derived appenders should override this method if option structure
+ * requires it.
+ */
+ abstract public function activateOptions();
+
/**
- * Add a filter to the end of the filter list.
+ * Subclasses of {...@link LoggerAppender} should implement
+ * this method to perform actual logging.
*
- * @param LoggerFilter $newFilter add a new LoggerFilter
+ * @param LoggerLoggingEvent $event
+ * @see doAppend()
* @abstract
*/
- abstract public function addFilter($newFilter);
+ abstract protected function append($event);
/**
* Clear the list of filters by removing all the filters in it.
* @abstract
*/
- abstract function clearFilters();
+ public function clearFilters() {
+ unset($this->headFilter);
+ unset($this->tailFilter);
+ $this->headFilter = null;
+ $this->tailFilter = null;
+ }
/**
+ * Finalize this appender by calling the derived class' <i>close()</i>
method.
+ */
+ public function finalize() {
+ // An appender might be closed then garbage collected. There is
no
+ // point in closing twice.
+ if($this->closed) {
+ return;
+ }
+ $this->close();
+ }
+
+ /**
* Return the first filter in the filter chain for this Appender.
* The return value may be <i>null</i> if no is filter is set.
* @return LoggerFilter
*/
- abstract function getFilter();
+ public function getFilter() {
+ return $this->headFilter;
+ }
+
+ /**
+ * Return the first filter in the filter chain for this Appender.
+ * The return value may be <i>null</i> if no is filter is set.
+ * @return LoggerFilter
+ */
+ public function getFirstFilter() {
+ return $this->headFilter;
+ }
+
/**
* Release any resources allocated.
@@ -98,53 +204,95 @@
abstract public function close();
/**
- * This method performs threshold checks and invokes filters before
+ * * This method performs threshold checks and invokes filters
before
* delegating actual logging to the subclasses specific <i>append()</i>
method.
+ * @see LoggerAppender::doAppend()
* @param LoggerLoggingEvent $event
- * @abstract
*/
- abstract public function doAppend($event);
+ public function doAppend($event) {
+ if($this->closed) {
+ return;
+ }
+
+ if(!$this->isAsSevereAsThreshold($event->getLevel())) {
+ return;
+ }
+
+ $f = $this->getFirstFilter();
+ while($f !== null) {
+ switch ($f->decide($event)) {
+ case LoggerFilter::DENY: return;
+ case LoggerFilter::ACCEPT: return
$this->append($event);
+ case LoggerFilter::NEUTRAL: $f = $f->getNext();
+ }
+ }
+ $this->append($event);
+ }
/**
* Get the name of this appender.
+ * @see LoggerAppender::getName()
* @return string
*/
- abstract public function getName();
-
+ public function getName() {
+ return $this->name;
+ }
+
/**
* Do not use this method.
- *
+ * @see LoggerAppender::setErrorHandler()
* @param object $errorHandler
*/
- abstract public function setErrorHandler($errorHandler);
+ public function setErrorHandler($errorHandler) {
+ if($errorHandler == null) {
+ // We do not throw exception here since the cause is
probably a
+ // bad config file.
+ //LoggerLog::warn("You have tried to set a null
error-handler.");
+ } else {
+ $this->errorHandler = $errorHandler;
+ }
+ }
/**
* Do not use this method.
+ * @see LoggerAppender::getErrorHandler()
* @return object Returns the ErrorHandler for this appender.
*/
- abstract public function getErrorHandler();
+ public function getErrorHandler() {
+ return $this->errorHandler;
+ }
/**
* Set the Layout for this appender.
- *
+ * @see LoggerAppender::setLayout()
* @param LoggerLayout $layout
*/
- abstract public function setLayout($layout);
+ public function setLayout($layout) {
+ if($this->requiresLayout()) {
+ $this->layout = $layout;
+ }
+ }
/**
* Returns this appender layout.
+ * @see LoggerAppender::getLayout()
* @return LoggerLayout
*/
- abstract public function getLayout();
-
- /**
+ public function getLayout() {
+ return $this->layout;
+ }
+
+/**
* Set the name of this appender.
*
* The name is used by other components to identify this appender.
*
+ *
* @param string $name
*/
- abstract public function setName($name);
+ public function setName($name) {
+ $this->name = $name;
+ }
/**
* Configurators call this method to determine if the appender
@@ -160,9 +308,73 @@
* <p>In the rather exceptional case, where the appender
* implementation admits a layout but can also work without it, then
* the appender should return <i>true</i>.</p>
- *
+ *
+ * @see LoggerAppender::requiresLayout()
* @return boolean
*/
- abstract public function requiresLayout();
+ public function requiresLayout() {
+ return $this->requiresLayout;
+ }
+
+ /**
+ * Returns this appenders threshold level.
+ * See the {...@link setThreshold()} method for the meaning of this
option.
+ * @return LoggerLevel
+ */
+ public function getThreshold() {
+ return $this->threshold;
+ }
+
+
+ /**
+ * Set the threshold level of this appender.
+ *
+ * @param mixed $threshold can be a {...@link LoggerLevel} object or a
string.
+ * @see LoggerOptionConverter::toLevel()
+ */
+ public function setThreshold($threshold) {
+ if(is_string($threshold)) {
+ $this->threshold =
LoggerOptionConverter::toLevel($threshold, null);
+ } else if($threshold instanceof LoggerLevel) {
+ $this->threshold = $threshold;
+ }
+ }
+
+ /**
+ * Check whether the message level is below the appender's threshold.
+ *
+ *
+ * If there is no threshold set, then the return value is always
<i>true</i>.
+ * @param LoggerLevel $priority
+ * @return boolean true if priority is greater or equal than threshold
+ */
+ public function isAsSevereAsThreshold($priority) {
+ if($this->threshold === null) {
+ return true;
+ }
+ return $priority->isGreaterOrEqual($this->getThreshold());
+ }
+
+ /**
+ * Perform actions before object serialization.
+ *
+ * Call {...@link finalize()} to properly close the appender.
+ */
+ function __sleep() {
+ $this->finalize();
+ return array_keys(get_object_vars($this));
+ }
+
+ public function __destruct() {
+ $this->finalize();
+ }
+/**
+ * Perform actions after object de-serialization.
+ *
+ * Call {...@link activateOptions()} to properly setup the appender.
+ */
+ function __wakeup() {
+ $this->activateOptions();
+ }
}
Modified: incubator/log4php/trunk/src/main/php/LoggerAppenderSkeleton.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/LoggerAppenderSkeleton.php?rev=771547&r1=771546&r2=771547&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/LoggerAppenderSkeleton.php (original)
+++ incubator/log4php/trunk/src/main/php/LoggerAppenderSkeleton.php Tue May 5
04:07:49 2009
@@ -31,276 +31,12 @@
*/
abstract class LoggerAppenderSkeleton extends LoggerAppender {
- /**
- * @var boolean closed appender flag
- */
- protected $closed = false;
- /**
- * @var object unused
- */
- protected $errorHandler;
-
- /**
- * The first filter in the filter chain
- * @var LoggerFilter
- */
- protected $headFilter = null;
-
- /**
- * LoggerLayout for this appender. It can be null if appender has its
own layout
- * @var LoggerLayout
- */
- protected $layout = null;
-
- /**
- * @var string Appender name
- */
- protected $name;
-
- /**
- * The last filter in the filter chain
- * @var LoggerFilter
- */
- protected $tailFilter = null;
-
- /**
- * @var LoggerLevel There is no level threshold filtering by default.
- */
- protected $threshold = null;
- /**
- * @var boolean needs a layout formatting ?
- */
- protected $requiresLayout = false;
- /**
- * Constructor
- *
- * @param string $name appender name
- */
- public function __construct($name) {
- $this->name = $name;
- $this->clearFilters();
- }
-
- /**
- * @param LoggerFilter $newFilter add a new LoggerFilter
- * @see LoggerAppender::addFilter()
- */
- public function addFilter($newFilter) {
- if($this->headFilter === null) {
- $this->headFilter = $newFilter;
- $this->tailFilter = $this->headFilter;
- } else {
- $this->tailFilter->next = $newFilter;
- $this->tailFilter = $this->tailFilter->next;
- }
- }
-
- /**
- * Derived appenders should override this method if option structure
- * requires it.
- */
- abstract public function activateOptions();
-
- /**
- * Subclasses of {...@link LoggerAppenderSkeleton} should implement
- * this method to perform actual logging.
- *
- * @param LoggerLoggingEvent $event
- * @see doAppend()
- * @abstract
- */
- abstract protected function append($event);
-
- /**
- * @see LoggerAppender::clearFilters()
- */
- public function clearFilters() {
- unset($this->headFilter);
- unset($this->tailFilter);
- $this->headFilter = null;
- $this->tailFilter = null;
- }
-
- /**
- * Finalize this appender by calling the derived class' <i>close()</i>
method.
- */
- public function finalize() {
- // An appender might be closed then garbage collected. There is
no
- // point in closing twice.
- if($this->closed) {
- return;
- }
- $this->close();
- }
-
- /**
- * Do not use this method.
- * @see LoggerAppender::getErrorHandler()
- * @return object
- */
- public function getErrorHandler() {
- return $this->errorHandler;
- }
-
- /**
- * @see LoggerAppender::getFilter()
- * @return LoggerFilter
- */
- public function getFilter() {
- return $this->headFilter;
- }
-
- /**
- * Return the first filter in the filter chain for this Appender.
- * The return value may be <i>null</i> if no is filter is set.
- * @return LoggerFilter
- */
- public function getFirstFilter() {
- return $this->headFilter;
- }
-
- /**
- * @see LoggerAppender::getLayout()
- * @return LoggerLayout
- */
- public function getLayout() {
- return $this->layout;
- }
-
- /**
- * @see LoggerAppender::getName()
- * @return string
- */
- public function getName() {
- return $this->name;
- }
- /**
- * Returns this appenders threshold level.
- * See the {...@link setThreshold()} method for the meaning of this
option.
- * @return LoggerLevel
- */
- public function getThreshold() {
- return $this->threshold;
- }
- /**
- * Check whether the message level is below the appender's threshold.
- *
- *
- * If there is no threshold set, then the return value is always
<i>true</i>.
- * @param LoggerLevel $priority
- * @return boolean true if priority is greater or equal than threshold
- */
- public function isAsSevereAsThreshold($priority) {
- if($this->threshold === null) {
- return true;
- }
- return $priority->isGreaterOrEqual($this->getThreshold());
- }
- /**
- * @see LoggerAppender::doAppend()
- * @param LoggerLoggingEvent $event
- */
- public function doAppend($event) {
- if($this->closed) {
- return;
- }
-
- if(!$this->isAsSevereAsThreshold($event->getLevel())) {
- return;
- }
-
- $f = $this->getFirstFilter();
- while($f !== null) {
- switch ($f->decide($event)) {
- case LoggerFilter::DENY: return;
- case LoggerFilter::ACCEPT: return
$this->append($event);
- case LoggerFilter::NEUTRAL: $f = $f->getNext();
- }
- }
- $this->append($event);
- }
-
- /**
- * @see LoggerAppender::requiresLayout()
- * @return boolean
- */
- public function requiresLayout() {
- return $this->requiresLayout;
- }
-
- /**
- * @see LoggerAppender::setErrorHandler()
- * @param object
- */
- public function setErrorHandler($errorHandler) {
- if($errorHandler == null) {
- // We do not throw exception here since the cause is
probably a
- // bad config file.
- //LoggerLog::warn("You have tried to set a null
error-handler.");
- } else {
- $this->errorHandler = $errorHandler;
- }
- }
-
- /**
- * @see LoggerAppender::setLayout()
- * @param LoggerLayout $layout
- */
- public function setLayout($layout) {
- if($this->requiresLayout()) {
- $this->layout = $layout;
- }
- }
-
- /**
- * @see LoggerAppender::setName()
- * @param string $name
- */
- public function setName($name) {
- $this->name = $name;
- }
-
- /**
- * Set the threshold level of this appender.
- *
- * @param mixed $threshold can be a {...@link LoggerLevel} object or a
string.
- * @see LoggerOptionConverter::toLevel()
- */
- public function setThreshold($threshold) {
- if(is_string($threshold)) {
- $this->threshold =
LoggerOptionConverter::toLevel($threshold, null);
- } else if($threshold instanceof LoggerLevel) {
- $this->threshold = $threshold;
- }
- }
-
- /**
- * Perform actions before object serialization.
- *
- * Call {...@link finalize()} to properly close the appender.
- */
- function __sleep() {
- $this->finalize();
- return array_keys(get_object_vars($this));
- }
-
- public function __destruct() {
- $this->finalize();
- }
- /**
- * Perform actions after object de-serialization.
- *
- * Call {...@link activateOptions()} to properly setup the appender.
- */
- function __wakeup() {
- $this->activateOptions();
- }
}
Modified: incubator/log4php/trunk/src/main/php/LoggerManager.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/LoggerManager.php?rev=771547&r1=771546&r2=771547&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/LoggerManager.php (original)
+++ incubator/log4php/trunk/src/main/php/LoggerManager.php Tue May 5 04:07:49
2009
@@ -47,7 +47,6 @@
private static $_classes = array(
'Logger' => '/Logger.php',
'LoggerAppender' => '/LoggerAppender.php',
- 'LoggerAppenderSkeleton' => '/LoggerAppenderSkeleton.php',
'LoggerHierarchy' => '/LoggerHierarchy.php',
'LoggerBasicConfigurator' => '/LoggerBasicConfigurator.php',
'LoggerDefaultCategoryFactory' =>
'/LoggerDefaultCategoryFactory.php',
Modified: incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderAdodb.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderAdodb.php?rev=771547&r1=771546&r2=771547&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderAdodb.php
(original)
+++ incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderAdodb.php Tue
May 5 04:07:49 2009
@@ -34,7 +34,7 @@
* @subpackage appenders
* @since 0.9
*/
-class LoggerAppenderAdodb extends LoggerAppenderSkeleton {
+class LoggerAppenderAdodb extends LoggerAppender {
/**
* Create the log table if it does not exists (optional).
@@ -106,9 +106,9 @@
*
* @param string $name appender name
*/
- function LoggerAppenderDb($name)
+ function __construct($name)
{
- $this->LoggerAppenderSkeleton($name);
+ parent::__construct($name);
}
/**
Modified:
incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderConsole.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderConsole.php?rev=771547&r1=771546&r2=771547&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderConsole.php
(original)
+++ incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderConsole.php
Tue May 5 04:07:49 2009
@@ -32,7 +32,7 @@
* @package log4php
* @subpackage appender
*/
-class LoggerAppenderConsole extends LoggerAppenderSkeleton {
+class LoggerAppenderConsole extends LoggerAppender {
const STDOUT = 'php://stdout';
const STDERR = 'php://stderr';
Modified:
incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderDailyFile.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderDailyFile.php?rev=771547&r1=771546&r2=771547&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderDailyFile.php
(original)
+++ incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderDailyFile.php
Tue May 5 04:07:49 2009
@@ -33,7 +33,7 @@
* @package log4php
* @subpackage appenders
*/
-class LoggerAppenderDailyFile extends LoggerAppenderFile {
+class LoggerAppenderDailyFile extends LoggerAppender {
/**
* Format date.
Modified: incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderDb.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderDb.php?rev=771547&r1=771546&r2=771547&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderDb.php
(original)
+++ incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderDb.php Tue May
5 04:07:49 2009
@@ -34,7 +34,7 @@
* @subpackage appenders
* @since 0.3
*/
-class LoggerAppenderDb extends LoggerAppenderSkeleton {
+class LoggerAppenderDb extends LoggerAppender {
/**
* Create the log table if it does not exists (optional).
@@ -82,9 +82,9 @@
*
* @param string $name appender name
*/
- function LoggerAppenderDb($name)
+ function __construct($name)
{
- $this->LoggerAppenderSkeleton($name);
+ parent::__construct($name);
}
/**
Modified: incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderEcho.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderEcho.php?rev=771547&r1=771546&r2=771547&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderEcho.php
(original)
+++ incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderEcho.php Tue
May 5 04:07:49 2009
@@ -29,7 +29,7 @@
* @package log4php
* @subpackage appenders
*/
-class LoggerAppenderEcho extends LoggerAppenderSkeleton {
+class LoggerAppenderEcho extends LoggerAppender {
/**
* @access private
Modified: incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderFile.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderFile.php?rev=771547&r1=771546&r2=771547&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderFile.php
(original)
+++ incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderFile.php Tue
May 5 04:07:49 2009
@@ -30,7 +30,7 @@
* @package log4php
* @subpackage appenders
*/
-class LoggerAppenderFile extends LoggerAppenderSkeleton {
+class LoggerAppenderFile extends LoggerAppender {
/**
* @var boolean if {...@link $file} exists, appends events.
Modified: incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderMail.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderMail.php?rev=771547&r1=771546&r2=771547&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderMail.php
(original)
+++ incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderMail.php Tue
May 5 04:07:49 2009
@@ -30,7 +30,7 @@
* @package log4php
* @subpackage appenders
*/
-class LoggerAppenderMail extends LoggerAppenderSkeleton {
+class LoggerAppenderMail extends LoggerAppender {
/**
* @var string 'from' field
Modified:
incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderMailEvent.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderMailEvent.php?rev=771547&r1=771546&r2=771547&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderMailEvent.php
(original)
+++ incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderMailEvent.php
Tue May 5 04:07:49 2009
@@ -35,7 +35,7 @@
* @package log4php
* @subpackage appenders
*/
-class LoggerAppenderMailEvent extends LoggerAppenderSkeleton {
+class LoggerAppenderMailEvent extends LoggerAppender {
/**
* @var string 'from' field
@@ -72,8 +72,8 @@
*
* @param string $name appender name
*/
- function LoggerAppenderMailEvent($name) {
- $this->LoggerAppenderSkeleton($name);
+ public function __construct($name) {
+ parent::__construct($name);
}
function activateOptions() {
Modified: incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderNull.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderNull.php?rev=771547&r1=771546&r2=771547&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderNull.php
(original)
+++ incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderNull.php Tue
May 5 04:07:49 2009
@@ -27,7 +27,7 @@
* @package log4php
* @subpackage appenders
*/
-class LoggerAppenderNull extends LoggerAppenderSkeleton {
+class LoggerAppenderNull extends LoggerAppender {
protected $requiresLayout = false;
Modified: incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderPhp.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderPhp.php?rev=771547&r1=771546&r2=771547&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderPhp.php
(original)
+++ incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderPhp.php Tue
May 5 04:07:49 2009
@@ -32,7 +32,7 @@
* @package log4php
* @subpackage appenders
*/
-class LoggerAppenderPhp extends LoggerAppenderSkeleton {
+class LoggerAppenderPhp extends LoggerAppender {
public function __construct($name) {
parent::__construct($name);
Modified:
incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderSocket.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderSocket.php?rev=771547&r1=771546&r2=771547&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderSocket.php
(original)
+++ incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderSocket.php Tue
May 5 04:07:49 2009
@@ -30,7 +30,7 @@
* @package log4php
* @subpackage appenders
*/
-class LoggerAppenderSocket extends LoggerAppenderSkeleton {
+class LoggerAppenderSocket extends LoggerAppender {
/**
* @var mixed socket connection resource
Modified:
incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderSyslog.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderSyslog.php?rev=771547&r1=771546&r2=771547&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderSyslog.php
(original)
+++ incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderSyslog.php Tue
May 5 04:07:49 2009
@@ -34,7 +34,7 @@
* @package log4php
* @subpackage appenders
*/
-class LoggerAppenderSyslog extends LoggerAppenderSkeleton {
+class LoggerAppenderSyslog extends LoggerAppender {
/**
* The ident string is added to each message. Typically the name of
your application.
Modified: incubator/log4php/trunk/src/main/php/spi/LoggerFilter.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/spi/LoggerFilter.php?rev=771547&r1=771546&r2=771547&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/spi/LoggerFilter.php (original)
+++ incubator/log4php/trunk/src/main/php/spi/LoggerFilter.php Tue May 5
04:07:49 2009
@@ -22,7 +22,7 @@
/**
* Users should extend this class to implement customized logging
- * event filtering. Note that {...@link LoggerCategory} and {...@link
LoggerAppenderSkeleton},
+ * event filtering. Note that {...@link LoggerCategory} and {...@link
LoggerAppender},
* the parent class of all standard
* appenders, have built-in filtering rules. It is suggested that you
* first use and understand the built-in rules before rushing to write
Modified: incubator/log4php/trunk/src/main/php/varia/LoggerLevelRangeFilter.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/varia/LoggerLevelRangeFilter.php?rev=771547&r1=771546&r2=771547&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/varia/LoggerLevelRangeFilter.php
(original)
+++ incubator/log4php/trunk/src/main/php/varia/LoggerLevelRangeFilter.php Tue
May 5 04:07:49 2009
@@ -42,8 +42,8 @@
* defined, then there is no maximum acceptable level (ie a
* level is never rejected for being too "high"/important).</p>
*
- * <p>Refer to the {...@link LoggerAppenderSkeleton::setThreshold()} method
- * available to <b>all</b> appenders extending {...@link
LoggerAppenderSkeleton}
+ * <p>Refer to the {...@link LoggerAppender::setThreshold()} method
+ * available to <b>all</b> appenders extending {...@link LoggerAppender}
* for a more convenient way to filter out events by level.</p>
*
* @log4j-class org.apache.log4j.varia.LevelRangeFilter
