You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4php-dev@logging.apache.org by gr...@apache.org on 2009/05/04 07:55:07 UTC
svn commit: r771183 - in /incubator/log4php/trunk/src: main/php/
main/php/appenders/ main/php/config/ main/php/helpers/ main/php/layouts/
main/php/or/ main/php/xml/ test/php/
Author: grobmeier
Date: Mon May 4 05:54:38 2009
New Revision: 771183
URL: http://svn.apache.org/viewvc?rev=771183&view=rev
Log:
#LOG4PHP-34: removed LoggerLog method calls or commented out replaced with todo
Modified:
incubator/log4php/trunk/src/main/php/LoggerAppenderSkeleton.php
incubator/log4php/trunk/src/main/php/LoggerLog.php
incubator/log4php/trunk/src/main/php/LoggerMDC.php
incubator/log4php/trunk/src/main/php/LoggerManager.php
incubator/log4php/trunk/src/main/php/LoggerNDC.php
incubator/log4php/trunk/src/main/php/LoggerPropertyConfigurator.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/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/LoggerAppenderRollingFile.php
incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderSocket.php
incubator/log4php/trunk/src/main/php/config/LoggerPropertySetter.php
incubator/log4php/trunk/src/main/php/helpers/LoggerFormattingInfo.php
incubator/log4php/trunk/src/main/php/helpers/LoggerOptionConverter.php
incubator/log4php/trunk/src/main/php/helpers/LoggerPatternConverter.php
incubator/log4php/trunk/src/main/php/helpers/LoggerPatternParser.php
incubator/log4php/trunk/src/main/php/layouts/LoggerPatternLayout.php
incubator/log4php/trunk/src/main/php/or/LoggerRendererMap.php
incubator/log4php/trunk/src/main/php/xml/LoggerDOMConfigurator.php
incubator/log4php/trunk/src/test/php/LoggerLogTest.php
Modified: incubator/log4php/trunk/src/main/php/LoggerAppenderSkeleton.php
URL: http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/LoggerAppenderSkeleton.php?rev=771183&r1=771182&r2=771183&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/LoggerAppenderSkeleton.php (original)
+++ incubator/log4php/trunk/src/main/php/LoggerAppenderSkeleton.php Mon May 4 05:54:38 2009
@@ -133,9 +133,6 @@
if($this->closed) {
return;
}
-
- LoggerLog::debug("LoggerAppenderSkeleton::finalize():name=[{$this->name}].");
-
$this->close();
}
@@ -210,15 +207,11 @@
* @param LoggerLoggingEvent $event
*/
public function doAppend($event) {
- LoggerLog::debug("LoggerAppenderSkeleton::doAppend()");
-
if($this->closed) {
- LoggerLog::debug("LoggerAppenderSkeleton::doAppend() Attempted to append to closed appender named [{$this->name}].");
return;
}
if(!$this->isAsSevereAsThreshold($event->getLevel())) {
- LoggerLog::debug("LoggerAppenderSkeleton::doAppend() event level is less severe than threshold.");
return;
}
@@ -249,7 +242,7 @@
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.");
+ //LoggerLog::warn("You have tried to set a null error-handler.");
} else {
$this->errorHandler = $errorHandler;
}
Modified: incubator/log4php/trunk/src/main/php/LoggerLog.php
URL: http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/LoggerLog.php?rev=771183&r1=771182&r2=771183&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/LoggerLog.php (original)
+++ incubator/log4php/trunk/src/main/php/LoggerLog.php Mon May 4 05:54:38 2009
@@ -25,7 +25,7 @@
* <p>It uses php {@link PHP_MANUAL#trigger_error trigger_error()} function
* to output messages.</p>
* <p>You need to recode methods to output messages in a different way.</p>
- *
+ * @deprecated
* @version $Revision$
* @package log4php
*/
Modified: incubator/log4php/trunk/src/main/php/LoggerMDC.php
URL: http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/LoggerMDC.php?rev=771183&r1=771182&r2=771183&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/LoggerMDC.php (original)
+++ incubator/log4php/trunk/src/main/php/LoggerMDC.php Mon May 4 05:54:38 2009
@@ -76,19 +76,14 @@
* @static
*/
public static function get($key) {
- LoggerLog::debug("LoggerMDC::get() key='$key'");
-
if(!empty($key)) {
if(strpos($key, 'server.') === 0) {
$varName = substr($key, 7);
- LoggerLog::debug("LoggerMDC::get() a _SERVER[$varName] is requested.");
return @$_SERVER[$varName];
} else if(strpos($key, 'env.') === 0) {
$varName = substr($key, 4);
- LoggerLog::debug("LoggerMDC::get() a _ENV[$varName] is requested.");
return @$_ENV[$varName];
} else if (isset($GLOBALS['log4php.LoggerMDC.ht'][$key])) {
- LoggerLog::debug("LoggerMDC::get() a user key is requested.");
return $GLOBALS['log4php.LoggerMDC.ht'][$key];
}
}
Modified: incubator/log4php/trunk/src/main/php/LoggerManager.php
URL: http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/LoggerManager.php?rev=771183&r1=771182&r2=771183&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/LoggerManager.php (original)
+++ incubator/log4php/trunk/src/main/php/LoggerManager.php Mon May 4 05:54:38 2009
@@ -54,7 +54,7 @@
'LoggerHierarchy' => '/LoggerHierarchy.php',
'LoggerLayout' => '/LoggerLayout.php',
'LoggerLevel' => '/LoggerLevel.php',
- 'LoggerLog' => '/LoggerLog.php',
+ // 'LoggerLog' => '/LoggerLog.php',
'LoggerMDC' => '/LoggerMDC.php',
'LoggerNDC' => '/LoggerNDC.php',
'LoggerPropertyConfigurator' => '/LoggerPropertyConfigurator.php',
@@ -294,8 +294,9 @@
}
if (!LOG4PHP_DEFAULT_INIT_OVERRIDE) {
- if (!LoggerManagerDefaultInit())
- LoggerLog::warn("LOG4PHP main() Default Init failed.");
+ if (!LoggerManagerDefaultInit()) {
+// LoggerLog::warn("LOG4PHP main() Default Init failed.");
+ }
}
/**
Modified: incubator/log4php/trunk/src/main/php/LoggerNDC.php
URL: http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/LoggerNDC.php?rev=771183&r1=771182&r2=771183&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/LoggerNDC.php (original)
+++ incubator/log4php/trunk/src/main/php/LoggerNDC.php Mon May 4 05:54:38 2009
@@ -101,7 +101,6 @@
* @static
*/
public static function clear() {
- LoggerLog::debug("LoggerNDC::clear()");
$GLOBALS['log4php.LoggerNDC.ht'] = array();
}
@@ -111,7 +110,6 @@
* @return array
*/
public static function get() {
- LoggerLog::debug("LoggerNDC::get()");
return $GLOBALS['log4php.LoggerNDC.ht'];
}
@@ -123,7 +121,6 @@
* @static
*/
public static function getDepth() {
- LoggerLog::debug("LoggerNDC::getDepth()");
return count($GLOBALS['log4php.LoggerNDC.ht']);
}
@@ -138,7 +135,6 @@
* @static
*/
public static function pop() {
- LoggerLog::debug("LoggerNDC::pop()");
if(count($GLOBALS['log4php.LoggerNDC.ht']) > 0) {
return array_pop($GLOBALS['log4php.LoggerNDC.ht']);
} else {
@@ -156,7 +152,6 @@
* @static
*/
public static function peek(){
- LoggerLog::debug("LoggerNDC::peek()");
if(count($GLOBALS['log4php.LoggerNDC.ht']) > 0) {
return end($GLOBALS['log4php.LoggerNDC.ht']);
} else {
@@ -174,7 +169,6 @@
* @static
*/
public static function push($message) {
- LoggerLog::debug("LoggerNDC::push()");
array_push($GLOBALS['log4php.LoggerNDC.ht'], (string)$message);
}
@@ -183,7 +177,6 @@
* @static
*/
public static function remove() {
- LoggerLog::debug("LoggerNDC::remove()");
LoggerNDC::clear();
}
@@ -203,8 +196,6 @@
* @static
*/
public static function setMaxDepth($maxDepth) {
- LoggerLog::debug("LoggerNDC::setMaxDepth() maxDepth='$maxDepth'");
-
$maxDepth = (int)$maxDepth;
if($maxDepth <= LOGGER_NDC_HT_SIZE) {
if(LoggerNDC::getDepth() > $maxDepth) {
Modified: incubator/log4php/trunk/src/main/php/LoggerPropertyConfigurator.php
URL: http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/LoggerPropertyConfigurator.php?rev=771183&r1=771182&r2=771183&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/LoggerPropertyConfigurator.php (original)
+++ incubator/log4php/trunk/src/main/php/LoggerPropertyConfigurator.php Mon May 4 05:54:38 2009
@@ -314,7 +314,6 @@
$properties = @parse_ini_file($url);
if($properties === false || count($properties) == 0) {
// as of PHP 5.2.7 parse_ini_file() returns FALSE instead of an empty array
- LoggerLog::warn("LoggerPropertyConfigurator::doConfigure() cannot load '$url' configuration.");
return false;
}
return $this->doConfigureProperties($properties, $repository);
@@ -342,8 +341,6 @@
$this->configureLoggerFactory($properties);
$this->parseCatsAndRenderers($properties, $hierarchy);
- LoggerLog::debug("LoggerPropertyConfigurator::doConfigureProperties() Finished configuring.");
-
return true;
}
@@ -368,28 +365,14 @@
$factoryFqcn = @$props[LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_LOGGER_FACTORY_KEY];
if(!empty($factoryFqcn)) {
$factoryClassName = basename($factoryFqcn);
- LoggerLog::debug(
- "LoggerPropertyConfigurator::configureLoggerFactory() Trying to load factory [" .
- $factoryClassName .
- "]."
- );
if(class_exists($factoryClassName)) {
$loggerFactory = new $factoryClassName();
} else {
- LoggerLog::debug(
- "LoggerPropertyConfigurator::configureLoggerFactory() Unable to load factory [" .
- $factoryClassName .
- "]. Using default."
- );
+ // LoggerPropertyConfigurator::configureLoggerFactory() Unable to load factory
$loggerFactory = $this->loggerFactory;
}
- LoggerLog::debug(
- "LoggerPropertyConfigurator::configureLoggerFactory() ".
- "Setting properties for category factory [" . get_class($loggerFactory) . "]."
- );
-
LoggerPropertySetter::setPropertiesByObject($loggerFactory, $props, LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_FACTORY_PREFIX . ".");
}
}
@@ -408,10 +391,10 @@
}
if(empty($value)) {
- LoggerLog::debug(
- "LoggerPropertyConfigurator::configureRootCategory() ".
- "Could not find root logger information. Is this OK?"
- );
+// LoggerLog::debug(
+// "LoggerPropertyConfigurator::configureRootCategory() ".
+// "Could not find root logger information. Is this OK?"
+// );
} else {
$root = $hierarchy->getRootLogger();
// synchronized(root) {
@@ -468,17 +451,10 @@
LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_ADDITIVITY_PREFIX . $loggerName,
$props
);
- LoggerLog::debug(
- "LoggerPropertyConfigurator::parseAdditivityForLogger() ".
- "Handling " . LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_ADDITIVITY_PREFIX . $loggerName . "=[{$value}]"
- );
+
// touch additivity only if necessary
if(!empty($value)) {
$additivity = LoggerOptionConverter::toBoolean($value, true);
- LoggerLog::debug(
- "LoggerPropertyConfigurator::parseAdditivityForLogger() ".
- "Setting additivity for [{$loggerName}] to [{$additivity}]"
- );
$cat->setAdditivity($additivity);
}
}
@@ -494,10 +470,6 @@
* @return Logger
*/
public function parseCategory($props, &$logger, $optionKey, $loggerName, $value) {
- LoggerLog::debug(
- "LoggerPropertyConfigurator::parseCategory() ".
- "Parsing for [{$loggerName}] with value=[{$value}]."
- );
// We must skip over ',' but not white space
$st = explode(',', $value);
@@ -511,20 +483,17 @@
return;
}
$levelStr = current($st);
- LoggerLog::debug(
- "LoggerPropertyConfigurator::parseCategory() ".
- "Level token is [$levelStr]."
- );
-
+
// If the level value is inherited, set category level value to
// null. We also check that the user has not specified inherited for the
// root category.
if('INHERITED' == strtoupper($levelStr) || 'NULL' == strtoupper($levelStr)) {
if($loggerName == LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_INTERNAL_ROOT_NAME) {
- LoggerLog::warn(
- "LoggerPropertyConfigurator::parseCategory() ".
- "The root logger cannot be set to null."
- );
+// TODO: throw exception?
+// LoggerLog::warn(
+// "LoggerPropertyConfigurator::parseCategory() ".
+// "The root logger cannot be set to null."
+// );
} else {
$logger->setLevel(null);
}
@@ -540,10 +509,7 @@
if(empty($appenderName)) {
continue;
}
- LoggerLog::debug(
- "LoggerPropertyConfigurator::parseCategory() ".
- "Parsing appender named [{$appenderName}]."
- );
+
$appender =& $this->parseAppender($props, $appenderName);
if($appender !== null) {
$logger->addAppender($appender);
@@ -559,10 +525,6 @@
function &parseAppender($props, $appenderName) {
$appender = LoggerAppender::singleton($appenderName);
if($appender !== null) {
- LoggerLog::debug(
- "LoggerPropertyConfigurator::parseAppender() ".
- "Appender [{$appenderName}] was already parsed."
- );
return $appender;
}
// Appender was not previously initialized.
@@ -572,62 +534,30 @@
if(!empty($appenderClass)) {
$appender = LoggerAppender::singleton($appenderName, $appenderClass);
if($appender === null) {
- LoggerLog::warn(
- "LoggerPropertyConfigurator::parseAppender() ".
- "Could not instantiate appender named [$appenderName]."
- );
return null;
}
} else {
- LoggerLog::warn(
- "LoggerPropertyConfigurator::parseAppender() ".
- "Could not instantiate appender named [$appenderName] with null className."
- );
return null;
}
$appender->setName($appenderName);
if($appender->requiresLayout() ) {
- LoggerLog::debug(
- "LoggerPropertyConfigurator::parseAppender() ".
- "Parsing layout section for [$appenderName]."
- );
$layoutClass = @$props[$layoutPrefix];
$layoutClass = LoggerOptionConverter::substVars($layoutClass, $props);
if(empty($layoutClass)) {
- LoggerLog::warn(
- "LoggerPropertyConfigurator::parseAppender() ".
- "layout class is empty in '$layoutPrefix'. Using Simple layout"
- );
$layout = LoggerLayout::factory('LoggerLayoutSimple');
} else {
$layout = LoggerLayout::factory($layoutClass);
if($layout === null) {
- LoggerLog::warn(
- "LoggerPropertyConfigurator::parseAppender() ".
- "cannot create layout '$layoutClass'. Using Simple layout"
- );
$layout = LoggerLayout::factory('LoggerLayoutSimple');
}
}
- LoggerLog::debug(
- "LoggerPropertyConfigurator::parseAppender() ".
- "Parsing layout options for [$appenderName]."
- );
LoggerPropertySetter::setPropertiesByObject($layout, $props, $layoutPrefix . ".");
- LoggerLog::debug(
- "LoggerPropertyConfigurator::parseAppender() ".
- "End Parsing layout options for [$appenderName]."
- );
$appender->setLayout($layout);
}
LoggerPropertySetter::setPropertiesByObject($appender, $props, $prefix . ".");
- LoggerLog::debug(
- "LoggerPropertyConfigurator::parseAppender() ".
- "Parsed [{$appenderName}] options."
- );
return $appender;
}
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=771183&r1=771182&r2=771183&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderAdodb.php (original)
+++ incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderAdodb.php Mon May 4 05:54:38 2009
@@ -121,7 +121,6 @@
{
$this->db = &ADONewConnection($this->type);
if (! $this->db->PConnect($this->host, $this->user, $this->password, $this->database)) {
- LoggerLog::debug("LoggerAppenderAdodb::activateOptions() DB Connect Error [".$this->db->ErrorMsg()."]");
$this->db = null;
$this->closed = true;
$this->canAppend = false;
@@ -137,11 +136,9 @@
if ($dbrs == false and $this->getCreateTable()) {
$query = "CREATE TABLE {$this->table} (timestamp varchar(32),logger varchar(32),level varchar(32),message varchar(64),thread varchar(32),file varchar(64),line varchar(4) );";
- LoggerLog::debug("LoggerAppenderAdodb::activateOptions() creating table '{$this->table}'... using sql='$query'");
$result = $this->db->Execute($query);
if (! $result) {
- LoggerLog::debug("LoggerAppenderAdodb::activateOptions() error while creating '{$this->table}'. Error is ".$this->db->ErrorMsg());
$this->canAppend = false;
return;
}
@@ -149,14 +146,9 @@
$this->canAppend = true;
}
- function append($event)
- {
+ function append($event) {
if ($this->canAppend) {
-
$query = $this->layout->format($event);
-
- LoggerLog::debug("LoggerAppenderAdodb::append() query='$query'");
-
$this->db->Execute($query);
}
}
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=771183&r1=771182&r2=771183&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderConsole.php (original)
+++ incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderConsole.php Mon May 4 05:54:38 2009
@@ -66,9 +66,7 @@
$this->target = self::STDOUT;
} elseif ($v == self::STDERR || strtoupper($v) == 'STDERR') {
$this->target = self::STDERR;
- } else {
- LoggerLog::debug("Invalid target. Using '".self::STDOUT."' by default.");
- }
+ }
}
public function getTarget() {
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=771183&r1=771182&r2=771183&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderDb.php (original)
+++ incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderDb.php Mon May 4 05:54:38 2009
@@ -98,7 +98,6 @@
$this->db = DB::connect($this->dsn);
if (DB::isError($this->db)) {
- LoggerLog::debug("LoggerAppenderDb::activateOptions() DB Connect Error [".$this->db->getMessage()."]");
$this->db = null;
$this->closed = true;
$this->canAppend = false;
@@ -112,12 +111,9 @@
$tableInfo = $this->db->tableInfo($this->table, $mode = null);
if (DB::isError($tableInfo) and $this->getCreateTable()) {
$query = "CREATE TABLE {$this->table} (timestamp varchar(32),logger varchar(32),level varchar(32),message varchar(64),thread varchar(32),file varchar(64),line varchar(4) );";
-
- LoggerLog::debug("LoggerAppenderDb::activateOptions() creating table '{$this->table}'... using sql='$query'");
$result = $this->db->query($query);
if (DB::isError($result)) {
- LoggerLog::debug("LoggerAppenderDb::activateOptions() error while creating '{$this->table}'. Error is ".$result->getMessage());
$this->closed = true;
$this->canAppend = false;
return;
@@ -129,14 +125,9 @@
}
- function append($event)
- {
+ function append($event) {
if ($this->canAppend) {
-
$query = $this->layout->format($event);
-
- LoggerLog::debug("LoggerAppenderDb::append() query='$query'");
-
$this->db->query($query);
}
}
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=771183&r1=771182&r2=771183&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderEcho.php (original)
+++ incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderEcho.php Mon May 4 05:54:38 2009
@@ -55,10 +55,7 @@
$this->closed = true;
}
- function append($event)
- {
- LoggerLog::debug("LoggerAppenderEcho::append()");
-
+ function append($event) {
if ($this->layout !== null) {
if ($this->firstAppend) {
echo $this->layout->getHeader();
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=771183&r1=771182&r2=771183&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderFile.php (original)
+++ incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderFile.php Mon May 4 05:54:38 2009
@@ -52,7 +52,6 @@
public function activateOptions() {
$fileName = $this->getFile();
- LoggerLog::debug("LoggerAppenderFile::activateOptions() opening file '{$fileName}'");
if(!is_file($fileName)) {
$dir = dirname($fileName);
@@ -153,7 +152,6 @@
public function append($event) {
if ($this->fp and $this->layout !== null) {
- LoggerLog::debug("LoggerAppenderFile::append()");
fwrite($this->fp, $this->layout->format($event));
}
}
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=771183&r1=771182&r2=771183&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderMail.php (original)
+++ incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderMail.php Mon May 4 05:54:38 2009
@@ -73,7 +73,6 @@
if (!empty($this->body) and $from !== null and $to !== null and $this->layout !== null) {
$subject = $this->subject;
- LoggerLog::debug("LoggerAppenderMail::close() sending mail from=[{$from}] to=[{$to}] subject=[{$subject}]");
mail(
$to, $subject,
$this->layout->getHeader() . $this->body . $this->layout->getFooter(),
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=771183&r1=771182&r2=771183&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderMailEvent.php (original)
+++ incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderMailEvent.php Mon May 4 05:54:38 2009
@@ -141,17 +141,9 @@
$smtpPort = $prevSmtpPort;
}
- LoggerLog::debug(
- "LoggerAppenderMailEvent::append()" .
- ":from=[{$from}]:to=[{$to}]:smtpHost=[{$smtpHost}]:smtpPort=[{$smtpPort}]"
- );
-
- if (!@mail( $to, $this->getSubject(),
+ @mail( $to, $this->getSubject(),
$this->layout->getHeader() . $this->layout->format($event) . $this->layout->getFooter($event),
- "From: {$from}\r\n"
- )) {
- LoggerLog::debug("LoggerAppenderMailEvent::append() mail error");
- }
+ "From: {$from}\r\n");
ini_set('SMTP', $prevSmtpHost);
ini_set('smtp_port', $prevSmtpPort);
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=771183&r1=771182&r2=771183&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderNull.php (original)
+++ incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderNull.php Mon May 4 05:54:38 2009
@@ -50,9 +50,7 @@
*
* @param LoggerLoggingEvent $event
*/
- protected function append($event)
- {
- LoggerLog::debug("LoggerAppenderNull::append()");
+ protected function append($event) {
}
}
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=771183&r1=771182&r2=771183&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderPhp.php (original)
+++ incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderPhp.php Mon May 4 05:54:38 2009
@@ -49,7 +49,6 @@
public function append($event) {
if ($this->layout !== null) {
- LoggerLog::debug("LoggerAppenderPhp::append()");
$level = $event->getLevel();
if ($level->isGreaterOrEqual(LoggerLevel::getLevelError())) {
trigger_error($this->layout->format($event), E_USER_ERROR);
Modified: incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderRollingFile.php
URL: http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderRollingFile.php?rev=771183&r1=771182&r2=771183&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderRollingFile.php (original)
+++ incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderRollingFile.php Mon May 4 05:54:38 2009
@@ -150,7 +150,6 @@
{
$this->fileName = $fileName;
$this->expandedFileName = realpath($fileName);
- LoggerLog::debug("LoggerAppenderRollingFile::setFileName():filename=[{$fileName}]:expandedFileName=[{$this->expandedFileName}]");
}
@@ -212,7 +211,6 @@
}
if ($maxFileSize === null) {
- LoggerLog::debug("LoggerAppenderRollingFile::setMaxFileSize():value=[$value] wrong declaration");
} else {
$this->maxFileSize = abs($maxFileSize);
}
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=771183&r1=771182&r2=771183&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderSocket.php (original)
+++ incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderSocket.php Mon May 4 05:54:38 2009
@@ -81,19 +81,15 @@
* Create a socket connection using defined parameters
*/
public function activateOptions() {
- LoggerLog::debug("LoggerAppenderSocket::activateOptions() creating a socket...");
$errno = 0;
$errstr = '';
$this->sp = @fsockopen($this->getRemoteHost(), $this->getPort(), $errno, $errstr, $this->getTimeout());
if ($errno) {
- LoggerLog::debug("LoggerAppenderSocket::activateOptions() socket error [$errno] $errstr");
$this->closed = true;
} else {
- LoggerLog::debug("LoggerAppenderSocket::activateOptions() socket created [".$this->sp."]");
if ($this->getUseXml()) {
$this->xmlLayout = LoggerLayout::factory('LoggerXmlLayout');
if ($this->xmlLayout === null) {
- LoggerLog::debug("LoggerAppenderSocket::activateOptions() useXml is true but layout is null");
$this->setUseXml(false);
} else {
$this->xmlLayout->setLocationInfo($this->getLocationInfo());
@@ -210,9 +206,6 @@
*/
public function append($event) {
if ($this->sp) {
-
- LoggerLog::debug("LoggerAppenderSocket::append()");
-
if ($this->getLocationInfo())
$event->getLocationInformation();
Modified: incubator/log4php/trunk/src/main/php/config/LoggerPropertySetter.php
URL: http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/config/LoggerPropertySetter.php?rev=771183&r1=771182&r2=771183&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/config/LoggerPropertySetter.php (original)
+++ incubator/log4php/trunk/src/main/php/config/LoggerPropertySetter.php Mon May 4 05:54:38 2009
@@ -87,8 +87,6 @@
* @param string $prefix Only keys having the specified prefix will be set.
*/
function setProperties($properties, $prefix) {
- LoggerLog::debug("LoggerOptionConverter::setProperties():prefix=[{$prefix}]");
-
$len = strlen($prefix);
while(list($key,) = each($properties)) {
if(strpos($key, $prefix) === 0) {
@@ -122,8 +120,6 @@
* @param string $value String value of the property
*/
function setProperty($name, $value) {
- LoggerLog::debug("LoggerOptionConverter::setProperty():name=[{$name}]:value=[{$value}]");
-
if($value === null) {
return;
}
@@ -131,22 +127,16 @@
$method = "set" . ucfirst($name);
if(!method_exists($this->obj, $method)) {
- LoggerLog::warn(
- "LoggerOptionConverter::setProperty() No such setter method for [{$name}] property in " .
- get_class($this->obj) . "."
- );
+ // no such setter method
+ return;
} else {
return call_user_func(array(&$this->obj, $method), $value);
}
}
function activate() {
- LoggerLog::debug("LoggerOptionConverter::activate()");
-
if(method_exists($this->obj, 'activateoptions')) {
return call_user_func(array(&$this->obj, 'activateoptions'));
- } else {
- LoggerLog::debug("LoggerOptionConverter::activate() Nothing to activate.");
- }
+ }
}
}
Modified: incubator/log4php/trunk/src/main/php/helpers/LoggerFormattingInfo.php
URL: http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/helpers/LoggerFormattingInfo.php?rev=771183&r1=771182&r2=771183&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/helpers/LoggerFormattingInfo.php (original)
+++ incubator/log4php/trunk/src/main/php/helpers/LoggerFormattingInfo.php Mon May 4 05:54:38 2009
@@ -46,6 +46,7 @@
}
function dump() {
- LoggerLog::debug("LoggerFormattingInfo::dump() min={$this->min}, max={$this->max}, leftAlign={$this->leftAlign}");
+ // TODO: other option to dump?
+ // LoggerLog::debug("LoggerFormattingInfo::dump() min={$this->min}, max={$this->max}, leftAlign={$this->leftAlign}");
}
}
Modified: incubator/log4php/trunk/src/main/php/helpers/LoggerOptionConverter.php
URL: http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/helpers/LoggerOptionConverter.php?rev=771183&r1=771182&r2=771183&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/helpers/LoggerOptionConverter.php (original)
+++ incubator/log4php/trunk/src/main/php/helpers/LoggerOptionConverter.php Mon May 4 05:54:38 2009
@@ -63,8 +63,6 @@
* @static
*/
public static function getSystemProperty($key, $def) {
- LoggerLog::debug("LoggerOptionConverter::getSystemProperty():key=[{$key}]:def=[{$def}].");
-
if(defined($key)) {
return (string)constant($key);
} else if(isset($_SERVER[$key])) {
@@ -173,19 +171,14 @@
return null;
}
- LoggerLog::debug("LoggerOptionConverter::toLevel():class=[{$clazz}]:pri=[{$levelName}]");
-
$clazz = basename($clazz);
if(class_exists($clazz)) {
$result = @call_user_func(array($clazz, 'toLevel'), $levelName, $defaultValue);
if(!$result instanceof LoggerLevel) {
- LoggerLog::debug("LoggerOptionConverter::toLevel():class=[{$clazz}] cannot call toLevel(). Returning default.");
$result = $defaultValue;
}
- } else {
- LoggerLog::warn("LoggerOptionConverter::toLevel() class '{$clazz}' doesnt exists.");
- }
+ }
return $result;
}
@@ -215,9 +208,7 @@
}
if(is_numeric($s)) {
return (float)$s * $multiplier;
- } else {
- LoggerLog::warn("LoggerOptionConverter::toFileSize() [{$s}] is not in proper form.");
- }
+ }
return $default;
}
@@ -276,33 +267,24 @@
* @static
*/
public static function substVars($val, $props = null) {
- LoggerLog::debug("LoggerOptionConverter::substVars():val=[{$val}]");
-
$sbuf = '';
$i = 0;
while(true) {
$j = strpos($val, LOG4PHP_OPTION_CONVERTER_DELIM_START, $i);
if($j === false) {
- LoggerLog::debug("LoggerOptionConverter::substVars() no more variables");
- // no more variables
+ // no more variables
if($i == 0) { // this is a simple string
- LoggerLog::debug("LoggerOptionConverter::substVars() simple string");
return $val;
} else { // add the tail string which contails no variables and return the result.
$sbuf .= substr($val, $i);
- LoggerLog::debug("LoggerOptionConverter::substVars():sbuf=[{$sbuf}]. Returning sbuf");
return $sbuf;
}
} else {
$sbuf .= substr($val, $i, $j-$i);
- LoggerLog::debug("LoggerOptionConverter::substVars():sbuf=[{$sbuf}]:i={$i}:j={$j}.");
$k = strpos($val, LOG4PHP_OPTION_CONVERTER_DELIM_STOP, $j);
if($k === false) {
- LoggerLog::warn(
- "LoggerOptionConverter::substVars() " .
- "'{$val}' has no closing brace. Opening brace at position {$j}."
- );
+ // LoggerOptionConverter::substVars() has no closing brace. Opening brace
return '';
} else {
$j += LOG4PHP_OPTION_CONVERTER_DELIM_START_LEN;
Modified: incubator/log4php/trunk/src/main/php/helpers/LoggerPatternConverter.php
URL: http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/helpers/LoggerPatternConverter.php?rev=771183&r1=771182&r2=771183&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/helpers/LoggerPatternConverter.php (original)
+++ incubator/log4php/trunk/src/main/php/helpers/LoggerPatternConverter.php Mon May 4 05:54:38 2009
@@ -81,15 +81,9 @@
* @param string &$sbuf string buffer
* @param LoggerLoggingEvent $e
*/
- function format(&$sbuf, $e)
- {
- LoggerLog::debug("LoggerPatternConverter::format() sbuf='$sbuf'");
-
+ function format(&$sbuf, $e) {
$s = $this->convert($e);
- LoggerLog::debug("LoggerPatternConverter::format() converted event is '$s'");
-
-
if($s == null or empty($s)) {
if(0 < $this->min)
$this->spacePad($sbuf, $this->min);
@@ -124,8 +118,6 @@
*/
function spacePad(&$sbuf, $length)
{
- LoggerLog::debug("LoggerPatternConverter::spacePad() sbuf='$sbuf' len='$length'");
-
while($length >= 32) {
$sbuf .= $GLOBALS['log4php.LoggerPatternConverter.spaces'][5];
$length -= 32;
@@ -164,8 +156,6 @@
*/
function LoggerBasicPatternConverter($formattingInfo, $type)
{
- LoggerLog::debug("LoggerBasicPatternConverter::LoggerBasicPatternConverter() type='$type'");
-
$this->LoggerPatternConverter($formattingInfo);
$this->type = $type;
}
@@ -219,8 +209,6 @@
*/
function LoggerLiteralPatternConverter($value)
{
- LoggerLog::debug("LoggerLiteralPatternConverter::LoggerLiteralPatternConverter() value='$value'");
-
$this->literal = $value;
}
@@ -262,8 +250,6 @@
*/
function LoggerDatePatternConverter($formattingInfo, $df)
{
- LoggerLog::debug("LoggerDatePatternConverter::LoggerDatePatternConverter() dateFormat='$df'");
-
$this->LoggerPatternConverter($formattingInfo);
$this->df = $df;
}
@@ -302,8 +288,6 @@
*/
function LoggerMDCPatternConverter($formattingInfo, $key)
{
- LoggerLog::debug("LoggerMDCPatternConverter::LoggerMDCPatternConverter() key='$key'");
-
$this->LoggerPatternConverter($formattingInfo);
$this->key = $key;
}
@@ -337,8 +321,6 @@
*/
function LoggerLocationPatternConverter($formattingInfo, $type)
{
- LoggerLog::debug("LoggerLocationPatternConverter::LoggerLocationPatternConverter() type='$type'");
-
$this->LoggerPatternConverter($formattingInfo);
$this->type = $type;
}
@@ -385,8 +367,6 @@
*/
function LoggerNamedPatternConverter($formattingInfo, $precision)
{
- LoggerLog::debug("LoggerNamedPatternConverter::LoggerNamedPatternConverter() precision='$precision'");
-
$this->LoggerPatternConverter($formattingInfo);
$this->precision = $precision;
}
@@ -442,8 +422,6 @@
*/
function LoggerClassNamePatternConverter($formattingInfo, $precision)
{
- LoggerLog::debug("LoggerClassNamePatternConverter::LoggerClassNamePatternConverter() precision='$precision'");
-
$this->LoggerNamedPatternConverter($formattingInfo, $precision);
}
@@ -471,8 +449,6 @@
*/
function LoggerCategoryPatternConverter($formattingInfo, $precision)
{
- LoggerLog::debug("LoggerCategoryPatternConverter::LoggerCategoryPatternConverter() precision='$precision'");
-
$this->LoggerNamedPatternConverter($formattingInfo, $precision);
}
Modified: incubator/log4php/trunk/src/main/php/helpers/LoggerPatternParser.php
URL: http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/helpers/LoggerPatternParser.php?rev=771183&r1=771182&r2=771183&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/helpers/LoggerPatternParser.php (original)
+++ incubator/log4php/trunk/src/main/php/helpers/LoggerPatternParser.php Mon May 4 05:54:38 2009
@@ -92,8 +92,6 @@
*/
function LoggerPatternParser($pattern)
{
- LoggerLog::debug("LoggerPatternParser::LoggerPatternParser() pattern='$pattern'");
-
$this->pattern = $pattern;
$this->patternLength = strlen($pattern);
$this->formattingInfo = new LoggerFormattingInfo();
@@ -105,8 +103,6 @@
*/
function addToList($pc)
{
- // LoggerLog::debug("LoggerPatternParser::addToList()");
-
if($this->head == null) {
$this->head = $pc;
$this->tail =& $this->head;
@@ -144,11 +140,8 @@
if (is_numeric($opt)) {
$r = (int)$opt;
if($r <= 0) {
- LoggerLog::warn("Precision option ({$opt}) isn't a positive integer.");
$r = 0;
}
- } else {
- LoggerLog::warn("Category option \"{$opt}\" not a decimal integer.");
}
}
return $r;
@@ -156,8 +149,6 @@
function parse()
{
- LoggerLog::debug("LoggerPatternParser::parse()");
-
$c = '';
$this->i = 0;
$this->currentLiteral = '';
@@ -189,7 +180,6 @@
default:
if(strlen($this->currentLiteral) != 0) {
$this->addToList(new LoggerLiteralPatternConverter($this->currentLiteral));
- LoggerLog::debug("LoggerPatternParser::parse() Parsed LITERAL converter: \"{$this->currentLiteral}\".");
}
$this->currentLiteral = $c;
$this->state = LOG4PHP_LOGGER_PATTERN_PARSER_CONVERTER_STATE;
@@ -236,7 +226,6 @@
$this->formattingInfo->max = ord($c) - ord('0');
$this->state = LOG4PHP_LOGGER_PATTERN_PARSER_MAX_STATE;
} else {
- LoggerLog::warn("LoggerPatternParser::parse() Error occured in position {$this->i}. Was expecting digit, instead got char \"{$c}\".");
$this->state = LOG4PHP_LOGGER_PATTERN_PARSER_LITERAL_STATE;
}
break;
@@ -261,18 +250,14 @@
function finalizeConverter($c)
{
- LoggerLog::debug("LoggerPatternParser::finalizeConverter() with char '$c'");
-
$pc = null;
switch($c) {
case 'c':
$pc = new LoggerCategoryPatternConverter($this->formattingInfo, $this->extractPrecisionOption());
- LoggerLog::debug("LoggerPatternParser::finalizeConverter() CATEGORY converter.");
$this->currentLiteral = '';
break;
case 'C':
$pc = new LoggerClassNamePatternConverter($this->formattingInfo, $this->extractPrecisionOption());
- LoggerLog::debug("LoggerPatternParser::finalizeConverter() CLASSNAME converter.");
$this->currentLiteral = '';
break;
case 'd':
@@ -293,28 +278,24 @@
if ($df == null) {
$df = LOG4PHP_LOGGER_PATTERN_PARSER_DATE_FORMAT_ISO8601;
}
- }
+ }
$pc = new LoggerDatePatternConverter($this->formattingInfo, $df);
$this->currentLiteral = '';
break;
case 'F':
$pc = new LoggerLocationPatternConverter($this->formattingInfo, LOG4PHP_LOGGER_PATTERN_PARSER_FILE_LOCATION_CONVERTER);
- LoggerLog::debug("LoggerPatternParser::finalizeConverter() File name converter.");
$this->currentLiteral = '';
break;
case 'l':
$pc = new LoggerLocationPatternConverter($this->formattingInfo, LOG4PHP_LOGGER_PATTERN_PARSER_FULL_LOCATION_CONVERTER);
- LoggerLog::debug("LoggerPatternParser::finalizeConverter() Location converter.");
$this->currentLiteral = '';
break;
case 'L':
$pc = new LoggerLocationPatternConverter($this->formattingInfo, LOG4PHP_LOGGER_PATTERN_PARSER_LINE_LOCATION_CONVERTER);
- LoggerLog::debug("LoggerPatternParser::finalizeConverter() LINE NUMBER converter.");
$this->currentLiteral = '';
break;
case 'm':
$pc = new LoggerBasicPatternConverter($this->formattingInfo, LOG4PHP_LOGGER_PATTERN_PARSER_MESSAGE_CONVERTER);
- LoggerLog::debug("LoggerPatternParser::finalizeConverter() MESSAGE converter.");
$this->currentLiteral = '';
break;
case 'M':
@@ -327,12 +308,10 @@
break;
case 'r':
$pc = new LoggerBasicPatternConverter($this->formattingInfo, LOG4PHP_LOGGER_PATTERN_PARSER_RELATIVE_TIME_CONVERTER);
- LoggerLog::debug("LoggerPatternParser::finalizeConverter() RELATIVE TIME converter.");
$this->currentLiteral = '';
break;
case 't':
$pc = new LoggerBasicPatternConverter($this->formattingInfo, LOG4PHP_LOGGER_PATTERN_PARSER_THREAD_CONVERTER);
- LoggerLog::debug("LoggerPatternParser::finalizeConverter() THREAD converter.");
$this->currentLiteral = '';
break;
case 'u':
@@ -340,28 +319,23 @@
$cNext = $this->pattern{$this->i};
if(ord($cNext) >= ord('0') and ord($cNext) <= ord('9')) {
$pc = new LoggerUserFieldPatternConverter($this->formattingInfo, (string)(ord($cNext) - ord('0')));
- LoggerLog::debug("LoggerPatternParser::finalizeConverter() USER converter [{$cNext}].");
$this->currentLiteral = '';
$this->i++;
} else {
- LoggerLog::warn("LoggerPatternParser::finalizeConverter() Unexpected char '{$cNext}' at position {$this->i}.");
}
}
break;
case 'x':
$pc = new LoggerBasicPatternConverter($this->formattingInfo, LOG4PHP_LOGGER_PATTERN_PARSER_NDC_CONVERTER);
- LoggerLog::debug("LoggerPatternParser::finalizeConverter() NDC converter.");
$this->currentLiteral = '';
break;
case 'X':
$xOpt = $this->extractOption();
$pc = new LoggerMDCPatternConverter($this->formattingInfo, $xOpt);
- LoggerLog::debug("LoggerPatternParser::finalizeConverter() MDC converter.");
$this->currentLiteral = '';
break;
default:
- LoggerLog::warn("LoggerPatternParser::finalizeConverter() Unexpected char [$c] at position {$this->i} in conversion pattern.");
$pc = new LoggerLiteralPatternConverter($this->currentLiteral);
$this->currentLiteral = '';
}
Modified: incubator/log4php/trunk/src/main/php/layouts/LoggerPatternLayout.php
URL: http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/layouts/LoggerPatternLayout.php?rev=771183&r1=771182&r2=771183&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/layouts/LoggerPatternLayout.php (original)
+++ incubator/log4php/trunk/src/main/php/layouts/LoggerPatternLayout.php Mon May 4 05:54:38 2009
@@ -235,8 +235,6 @@
*/
function format($event)
{
- LoggerLog::debug("LoggerPatternLayout::format()");
-
// Reset working stringbuffer
$this->sbuf = '';
$c = $this->head;
Modified: incubator/log4php/trunk/src/main/php/or/LoggerRendererMap.php
URL: http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/or/LoggerRendererMap.php?rev=771183&r1=771182&r2=771183&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/or/LoggerRendererMap.php (original)
+++ incubator/log4php/trunk/src/main/php/or/LoggerRendererMap.php Mon May 4 05:54:38 2009
@@ -58,10 +58,8 @@
* @static
*/
public static function addRenderer($repository, $renderedClassName, $renderingClassName) {
- LoggerLog::debug("LoggerRendererMap::addRenderer() Rendering class: [{$renderingClassName}], Rendered class: [{$renderedClassName}].");
$renderer = LoggerObjectRenderer::factory($renderingClassName);
if($renderer == null) {
- LoggerLog::warn("LoggerRendererMap::addRenderer() Could not instantiate renderer [{$renderingClassName}].");
return;
} else {
$repository->setRenderer($renderedClassName, $renderer);
Modified: incubator/log4php/trunk/src/main/php/xml/LoggerDOMConfigurator.php
URL: http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/xml/LoggerDOMConfigurator.php?rev=771183&r1=771182&r2=771183&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/xml/LoggerDOMConfigurator.php (original)
+++ incubator/log4php/trunk/src/main/php/xml/LoggerDOMConfigurator.php Mon May 4 05:54:38 2009
@@ -184,10 +184,6 @@
$errorCode = xml_get_error_code($parser);
$errorStr = xml_error_string($errorCode);
$errorLine = xml_get_current_line_number($parser);
- LoggerLog::warn(
- "LoggerDOMConfigurator::parse() ".
- "Parsing error [{$errorCode}] {$errorStr}, line {$errorLine}"
- );
$this->repository->resetConfiguration();
} else {
xml_parser_free($parser);
@@ -209,8 +205,6 @@
case 'CONFIGURATION' :
case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':CONFIGURATION':
- LoggerLog::debug("LoggerDOMConfigurator::tagOpen() CONFIGURATION");
-
if (isset($attribs['THRESHOLD'])) {
$this->repository->setThreshold(
@@ -220,6 +214,8 @@
)
);
}
+ /*
+ * TODO: Remove due to LOG4PHP-34
if (isset($attribs['DEBUG'])) {
$debug = LoggerOptionConverter::toBoolean($this->subst($attribs['DEBUG']), LoggerLog::internalDebugging());
$this->repository->debug = $debug;
@@ -227,6 +223,7 @@
LoggerLog::debug("LoggerDOMConfigurator::tagOpen() LOG4PHP:CONFIGURATION. Internal Debug turned ".($debug ? 'on':'off'));
}
+ */
break;
case 'APPENDER' :
@@ -238,12 +235,7 @@
$name = $this->subst(@$attribs['NAME']);
$class = $this->subst(@$attribs['CLASS']);
- LoggerLog::debug("LoggerDOMConfigurator::tagOpen():tag=[$tag]:name=[$name]:class=[$class]");
-
$this->appender =& LoggerAppender::singleton($name, $class);
- if ($this->appender === null) {
- LoggerLog::warn("LoggerDOMConfigurator::tagOpen() APPENDER cannot instantiate appender '$name'");
- }
$this->state[] = LOG4PHP_LOGGER_DOM_CONFIGURATOR_APPENDER_STATE;
break;
@@ -251,13 +243,9 @@
case 'APPENDER-REF' :
case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':APPENDER_REF':
case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':APPENDER-REF':
-
-
if (isset($attribs['REF']) and !empty($attribs['REF'])) {
$appenderName = $this->subst($attribs['REF']);
- LoggerLog::debug("LoggerDOMConfigurator::tagOpen() APPENDER-REF ref='$appenderName'");
-
$appender =& LoggerAppender::singleton($appenderName);
if ($appender !== null) {
switch (end($this->state)) {
@@ -266,19 +254,12 @@
$this->logger->addAppender($appender);
break;
}
- } else {
- LoggerLog::warn("LoggerDOMConfigurator::tagOpen() APPENDER-REF ref '$appenderName' points to a null appender");
}
- } else {
- LoggerLog::warn("LoggerDOMConfigurator::tagOpen() APPENDER-REF ref not set or empty");
- }
+ }
break;
case 'FILTER' :
case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':FILTER':
-
- LoggerLog::debug("LoggerDOMConfigurator::tagOpen() FILTER");
-
unset($this->filter);
$this->filter = null;
@@ -286,22 +267,13 @@
if (!empty($filterName)) {
$this->filter = new $filterName();
$this->state[] = LOG4PHP_LOGGER_DOM_CONFIGURATOR_FILTER_STATE;
- } else {
- LoggerLog::warn("LoggerDOMConfigurator::tagOpen() FILTER filter name cannot be empty");
- }
+ }
break;
case 'LAYOUT':
case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':LAYOUT':
-
$class = @$attribs['CLASS'];
-
- LoggerLog::debug("LoggerDOMConfigurator::tagOpen() LAYOUT class='{$class}'");
-
$this->layout = LoggerLayout::factory($this->subst($class));
- if ($this->layout === null)
- LoggerLog::warn("LoggerDOMConfigurator::tagOpen() LAYOUT unable to instanciate class='{$class}'");
-
$this->state[] = LOG4PHP_LOGGER_DOM_CONFIGURATOR_LAYOUT_STATE;
break;
@@ -315,27 +287,29 @@
$loggerName = $this->subst(@$attribs['NAME']);
if (!empty($loggerName)) {
- LoggerLog::debug("LoggerDOMConfigurator::tagOpen() LOGGER. name='$loggerName'");
-
$class = $this->subst(@$attribs['CLASS']);
if (empty($class)) {
$this->logger =& $this->repository->getLogger($loggerName);
} else {
$className = basename($class);
if (!class_exists($className)) {
- LoggerLog::warn(
+ // TODO throw exception?
+ /*LoggerLog::warn(
"LoggerDOMConfigurator::tagOpen() LOGGER. ".
"cannot find '$className'."
- );
+ );*/
} else {
if (in_array('getlogger', get_class_methods($className))) {
$this->logger =& call_user_func(array($className, 'getlogger'), $loggerName);
} else {
+ // TODO throw exception?
+ /*
LoggerLog::warn(
"LoggerDOMConfigurator::tagOpen() LOGGER. ".
"class '$className' doesnt implement 'getLogger()' method."
- );
+ );
+ */
}
}
}
@@ -343,9 +317,7 @@
$additivity = LoggerOptionConverter::toBoolean($this->subst($attribs['ADDITIVITY']), true);
$this->logger->setAdditivity($additivity);
}
- } else {
- LoggerLog::warn("LoggerDOMConfigurator::tagOpen() LOGGER. Attribute 'name' is not set or is empty.");
- }
+ }
$this->state[] = LOG4PHP_LOGGER_DOM_CONFIGURATOR_LOGGER_STATE;;
break;
@@ -355,14 +327,12 @@
case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':PRIORITY':
if (!isset($attribs['VALUE'])) {
- LoggerLog::debug("LoggerDOMConfigurator::tagOpen() LEVEL value not set");
+ // LoggerDOMConfigurator::tagOpen() LEVEL value not set
break;
}
- LoggerLog::debug("LoggerDOMConfigurator::tagOpen() LEVEL value={$attribs['VALUE']}");
-
if ($this->logger === null) {
- LoggerLog::warn("LoggerDOMConfigurator::tagOpen() LEVEL. parent logger is null");
+ // LoggerDOMConfigurator::tagOpen() LEVEL. parent logger is null
break;
}
@@ -374,7 +344,6 @@
$this->logger->getLevel()
)
);
- LoggerLog::debug("LoggerDOMConfigurator::tagOpen() LEVEL root level is now '{$attribs['VALUE']}' ");
break;
case LOG4PHP_LOGGER_DOM_CONFIGURATOR_LOGGER_STATE:
$this->logger->setLevel(
@@ -385,27 +354,18 @@
);
break;
default:
- LoggerLog::warn("LoggerDOMConfigurator::tagOpen() LEVEL state '{$this->state}' not allowed here");
+ //LoggerLog::warn("LoggerDOMConfigurator::tagOpen() LEVEL state '{$this->state}' not allowed here");
}
break;
case 'PARAM':
case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':PARAM':
-
- LoggerLog::debug("LoggerDOMConfigurator::tagOpen() PARAM");
-
if (!isset($attribs['NAME'])) {
- LoggerLog::warn(
- "LoggerDOMConfigurator::tagOpen() PARAM. ".
- "attribute 'name' not defined."
- );
+ // LoggerDOMConfigurator::tagOpen() PARAM attribute 'name' not defined.
break;
}
if (!isset($attribs['VALUE'])) {
- LoggerLog::warn(
- "LoggerDOMConfigurator::tagOpen() PARAM. ".
- "attribute 'value' not defined."
- );
+ // LoggerDOMConfigurator::tagOpen() PARAM. attribute 'value' not defined.
break;
}
@@ -413,35 +373,20 @@
case LOG4PHP_LOGGER_DOM_CONFIGURATOR_APPENDER_STATE:
if ($this->appender !== null) {
$this->setter($this->appender, $this->subst($attribs['NAME']), $this->subst($attribs['VALUE']));
- } else {
- LoggerLog::warn(
- "LoggerDOMConfigurator::tagOpen() PARAM. ".
- " trying to set property to a null appender."
- );
}
break;
case LOG4PHP_LOGGER_DOM_CONFIGURATOR_LAYOUT_STATE:
if ($this->layout !== null) {
$this->setter($this->layout, $this->subst($attribs['NAME']), $this->subst($attribs['VALUE']));
- } else {
- LoggerLog::warn(
- "LoggerDOMConfigurator::tagOpen() PARAM. ".
- " trying to set property to a null layout."
- );
}
break;
case LOG4PHP_LOGGER_DOM_CONFIGURATOR_FILTER_STATE:
if ($this->filter !== null) {
$this->setter($this->filter, $this->subst($attribs['NAME']), $this->subst($attribs['VALUE']));
- } else {
- LoggerLog::warn(
- "LoggerDOMConfigurator::tagOpen() PARAM. ".
- " trying to set property to a null filter."
- );
}
break;
default:
- LoggerLog::warn("LoggerDOMConfigurator::tagOpen() PARAM state '{$this->state}' not allowed here");
+ //LoggerLog::warn("LoggerDOMConfigurator::tagOpen() PARAM state '{$this->state}' not allowed here");
}
break;
@@ -451,32 +396,22 @@
$renderedClass = $this->subst(@$attribs['RENDEREDCLASS']);
$renderingClass = $this->subst(@$attribs['RENDERINGCLASS']);
- LoggerLog::debug("LoggerDOMConfigurator::tagOpen() RENDERER renderedClass='$renderedClass' renderingClass='$renderingClass'");
-
if (!empty($renderedClass) and !empty($renderingClass)) {
$renderer = LoggerObjectRenderer::factory($renderingClass);
if ($renderer === null) {
- LoggerLog::warn("LoggerDOMConfigurator::tagOpen() RENDERER cannot instantiate '$renderingClass'");
+ // LoggerDOMConfigurator::tagOpen() RENDERER cannot instantiate '$renderingClass'
} else {
$this->repository->setRenderer($renderedClass, $renderer);
}
- } else {
- LoggerLog::warn("LoggerDOMConfigurator::tagOpen() RENDERER renderedClass or renderingClass is empty");
}
break;
case 'ROOT':
case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':ROOT':
-
- LoggerLog::debug("LoggerDOMConfigurator::tagOpen() ROOT");
-
$this->logger =& LoggerManager::getRootLogger();
-
$this->state[] = LOG4PHP_LOGGER_DOM_CONFIGURATOR_ROOT_STATE;
break;
-
}
-
}
@@ -490,23 +425,13 @@
case 'CONFIGURATION' :
case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':CONFIGURATION':
-
- LoggerLog::debug("LoggerDOMConfigurator::tagClose() CONFIGURATION");
break;
case 'APPENDER' :
case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':APPENDER':
-
- LoggerLog::debug("LoggerDOMConfigurator::tagClose() APPENDER");
-
if ($this->appender !== null) {
if ($this->appender->requiresLayout() and $this->appender->getLayout() === null) {
$appenderName = $this->appender->getName();
- LoggerLog::warn(
- "LoggerDOMConfigurator::tagClose() APPENDER. ".
- "'$appenderName' requires a layout that is not defined. ".
- "Using a simple layout"
- );
$this->appender->setLayout(LoggerLayout::factory('LoggerLayoutSimple'));
}
$this->appender->activateOptions();
@@ -516,9 +441,6 @@
case 'FILTER' :
case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':FILTER':
-
- LoggerLog::debug("LoggerDOMConfigurator::tagClose() FILTER");
-
if ($this->filter !== null) {
$this->filter->activateOptions();
$this->appender->addFilter($this->filter);
@@ -529,9 +451,6 @@
case 'LAYOUT':
case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':LAYOUT':
-
- LoggerLog::debug("LoggerDOMConfigurator::tagClose() LAYOUT");
-
if ($this->appender !== null and $this->layout !== null and $this->appender->requiresLayout()) {
$this->layout->activateOptions();
$this->appender->setLayout($this->layout);
@@ -542,17 +461,11 @@
case 'LOGGER':
case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':LOGGER':
-
- LoggerLog::debug("LoggerDOMConfigurator::tagClose() LOGGER");
-
array_pop($this->state);
break;
case 'ROOT':
case LOG4PHP_LOGGER_DOM_CONFIGURATOR_XMLNS.':ROOT':
-
- LoggerLog::debug("LoggerDOMConfigurator::tagClose() ROOT");
-
array_pop($this->state);
break;
}
@@ -565,16 +478,14 @@
*/
function setter(&$object, $name, $value)
{
+ // TODO: check if this can be replaced with LoggerPropertySetter
if (empty($name)) {
- LoggerLog::debug("LoggerDOMConfigurator::setter() 'name' param cannot be empty");
return false;
}
$methodName = 'set'.ucfirst($name);
if (method_exists($object, $methodName)) {
- LoggerLog::debug("LoggerDOMConfigurator::setter() Calling ".get_class($object)."::{$methodName}({$value})");
return call_user_func(array(&$object, $methodName), $value);
} else {
- LoggerLog::warn("LoggerDOMConfigurator::setter() ".get_class($object)."::{$methodName}() does not exists");
return false;
}
}
Modified: incubator/log4php/trunk/src/test/php/LoggerLogTest.php
URL: http://svn.apache.org/viewvc/incubator/log4php/trunk/src/test/php/LoggerLogTest.php?rev=771183&r1=771182&r2=771183&view=diff
==============================================================================
--- incubator/log4php/trunk/src/test/php/LoggerLogTest.php (original)
+++ incubator/log4php/trunk/src/test/php/LoggerLogTest.php Mon May 4 05:54:38 2009
@@ -22,20 +22,21 @@
* @link http://logging.apache.org/log4php
*/
+// @deprecated
class LoggerLogTest extends PHPUnit_Framework_TestCase {
public function testInternalDebuggingIsInitallyFalse() {
- self::assertFalse( LoggerLog::internalDebugging() );
+// self::assertFalse( LoggerLog::internalDebugging() );
}
public function testInternalDebuggingIsSetTrue() {
- LoggerLog::internalDebugging( true );
- self::assertTrue( LoggerLog::internalDebugging() );
+// LoggerLog::internalDebugging( true );
+// self::assertTrue( LoggerLog::internalDebugging() );
}
public function testInternalDebuggingIsSetFalse() {
- LoggerLog::internalDebugging( false );
- self::assertFalse( LoggerLog::internalDebugging() );
+// LoggerLog::internalDebugging( false );
+// self::assertFalse( LoggerLog::internalDebugging() );
}
}