Author: grobmeier
Date: Sat Feb 20 14:26:12 2010
New Revision: 912120
URL: http://svn.apache.org/viewvc?rev=912120&view=rev
Log:
LOG4PHP-95: Added trace level to Log4PHP. Contributed by Ivan Habunek. Test
added by myself
Modified:
incubator/log4php/trunk/src/changes/changes.xml
incubator/log4php/trunk/src/main/php/Logger.php
incubator/log4php/trunk/src/main/php/LoggerLevel.php
incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderSyslog.php
incubator/log4php/trunk/src/test/php/LoggerLevelTest.php
incubator/log4php/trunk/src/test/php/configurators/LoggerConfiguratorIniTest.php
incubator/log4php/trunk/src/test/php/configurators/LoggerConfiguratorPhpTest.php
incubator/log4php/trunk/src/test/php/configurators/LoggerConfiguratorXmlTest.php
incubator/log4php/trunk/src/test/php/configurators/test1.php
incubator/log4php/trunk/src/test/php/configurators/test1.properties
incubator/log4php/trunk/src/test/php/configurators/test1.xml
Modified: incubator/log4php/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/changes/changes.xml?rev=912120&r1=912119&r2=912120&view=diff
==============================================================================
--- incubator/log4php/trunk/src/changes/changes.xml (original)
+++ incubator/log4php/trunk/src/changes/changes.xml Sat Feb 20 14:26:12 2010
@@ -25,7 +25,8 @@
<body>
<release version="2.1" description="Stabilizing">
<action type="fix" issue="LOG4PHP-91">LoginOptionConverter.php
(used wrong constant name)</action>
-y <action type="fix" issue="LOG4PHP-96" by="Tommy
Montgomery">Some of the tests don't pass under Windows</action>
+ <action type="update" issue="LOG4PHP-95" by="Ivan Habunek,
Christian Grobmeier">Add trace level to Log4PHP</action>
+ <action type="fix" issue="LOG4PHP-96" by="Tommy
Montgomery">Some of the tests don't pass under Windows</action>
</release>
<release version="2.0" description="PHP 5 compatibility">
<action type="fix" issue="LOG4PHP-3">Maven 2.0 build</action>
Modified: incubator/log4php/trunk/src/main/php/Logger.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/Logger.php?rev=912120&r1=912119&r2=912120&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/Logger.php (original)
+++ incubator/log4php/trunk/src/main/php/Logger.php Sat Feb 20 14:26:12 2010
@@ -207,6 +207,16 @@
/* Logging methods */
/**
+ * Log a message object with the TRACE level including the caller.
+ *
+ * @param mixed $message message
+ * @param mixed $caller caller object or caller string id
+ */
+ public function trace($message, $caller = null) {
+ $this->logLevel($message, LoggerLevel::getLevelTrace(),
$caller);
+ }
+
+ /**
* Log a message object with the DEBUG level including the caller.
*
* @param mixed $message message
Modified: incubator/log4php/trunk/src/main/php/LoggerLevel.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/LoggerLevel.php?rev=912120&r1=912119&r2=912120&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/LoggerLevel.php (original)
+++ incubator/log4php/trunk/src/main/php/LoggerLevel.php Sat Feb 20 14:26:12
2010
@@ -39,6 +39,7 @@
const WARN = 30000;
const INFO = 20000;
const DEBUG = 10000;
+ const TRACE = 5000;
const ALL = -2147483647;
/**
@@ -162,6 +163,18 @@
}
return self::$levelMap[LoggerLevel::DEBUG];
}
+
+ /**
+ * Returns a Trace Level
+ * @static
+ * @return LoggerLevel
+ */
+ public static function getLevelTrace() {
+ if(!isset(self::$levelMap[LoggerLevel::TRACE])) {
+ self::$levelMap[LoggerLevel::TRACE] = new
LoggerLevel(LoggerLevel::TRACE, 'TRACE', 7);
+ }
+ return self::$levelMap[LoggerLevel::TRACE];
+ }
/**
* Returns an All Level
@@ -231,6 +244,7 @@
if(is_int($arg)) {
switch($arg) {
case self::ALL: return
self::getLevelAll();
+ case self::TRACE: return
self::getLevelTrace();
case self::DEBUG: return
self::getLevelDebug();
case self::INFO: return
self::getLevelInfo();
case self::WARN: return
self::getLevelWarn();
@@ -242,6 +256,7 @@
} else {
switch(strtoupper($arg)) {
case 'ALL': return
self::getLevelAll();
+ case 'TRACE': return
self::getLevelTrace();
case 'DEBUG': return
self::getLevelDebug();
case 'INFO': return
self::getLevelInfo();
case 'WARN': return
self::getLevelWarn();
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=912120&r1=912119&r2=912120&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderSyslog.php
(original)
+++ incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderSyslog.php Sat
Feb 20 14:26:12 2010
@@ -40,6 +40,7 @@
* - <b>ERROR > level >= WARN</b> to LOG_WARNING
* - <b>WARN > level >= INFO</b> to LOG_INFO
* - <b>INFO > level >= DEBUG</b> to LOG_DEBUG
+ * - <b>DEBUG > level >= TRACE</b> to LOG_DEBUG
*
* An example:
*
@@ -202,6 +203,8 @@
syslog(LOG_INFO, $message);
} else if
($level->isGreaterOrEqual(LoggerLevel::getLevelDebug())) {
syslog(LOG_DEBUG, $message);
+ } else if
($level->isGreaterOrEqual(LoggerLevel::getLevelTrace())) {
+ syslog(LOG_DEBUG, $message); // No
trace level in syslog
}
}
closelog();
Modified: incubator/log4php/trunk/src/test/php/LoggerLevelTest.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/test/php/LoggerLevelTest.php?rev=912120&r1=912119&r2=912120&view=diff
==============================================================================
--- incubator/log4php/trunk/src/test/php/LoggerLevelTest.php (original)
+++ incubator/log4php/trunk/src/test/php/LoggerLevelTest.php Sat Feb 20
14:26:12 2010
@@ -68,6 +68,12 @@
$this->doTestLevel( LoggerLevel::getLevelDebug(),
LoggerLevel::DEBUG, 'DEBUG', 7 );
$this->doTestLevel( LoggerLevel::toLevel(LoggerLevel::DEBUG),
LoggerLevel::DEBUG, 'DEBUG', 7 );
$this->doTestLevel( LoggerLevel::toLevel('DEBUG'),
LoggerLevel::DEBUG, 'DEBUG', 7 );
+ }
+
+ public function testLevelTrace() {
+ $this->doTestLevel( LoggerLevel::getLevelTrace(),
LoggerLevel::TRACE, 'TRACE', 7 );
+ $this->doTestLevel( LoggerLevel::toLevel(LoggerLevel::TRACE),
LoggerLevel::TRACE, 'TRACE', 7 );
+ $this->doTestLevel( LoggerLevel::toLevel('TRACE'),
LoggerLevel::TRACE, 'TRACE', 7 );
}
public function testLevelAll() {
Modified:
incubator/log4php/trunk/src/test/php/configurators/LoggerConfiguratorIniTest.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/test/php/configurators/LoggerConfiguratorIniTest.php?rev=912120&r1=912119&r2=912120&view=diff
==============================================================================
---
incubator/log4php/trunk/src/test/php/configurators/LoggerConfiguratorIniTest.php
(original)
+++
incubator/log4php/trunk/src/test/php/configurators/LoggerConfiguratorIniTest.php
Sat Feb 20 14:26:12 2010
@@ -58,6 +58,10 @@
self::assertEquals(LoggerLevel::getLevelInfo(),
$logger->getLevel());
self::assertFalse($logger->getAdditivity());
+ $logger3 = Logger::getLogger('tracer');
+ self::assertEquals(LoggerLevel::getLevelTrace(),
$logger3->getLevel());
+ self::assertFalse($logger3->getAdditivity());
+
$logger2 = Logger::getLogger('mylogger');
$logger2->setAdditivity(true);
self::assertTrue($logger2->getAdditivity());
Modified:
incubator/log4php/trunk/src/test/php/configurators/LoggerConfiguratorPhpTest.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/test/php/configurators/LoggerConfiguratorPhpTest.php?rev=912120&r1=912119&r2=912120&view=diff
==============================================================================
---
incubator/log4php/trunk/src/test/php/configurators/LoggerConfiguratorPhpTest.php
(original)
+++
incubator/log4php/trunk/src/test/php/configurators/LoggerConfiguratorPhpTest.php
Sat Feb 20 14:26:12 2010
@@ -43,5 +43,7 @@
self::assertTrue($layout instanceof LoggerLayoutSimple);
$logger = Logger::getLogger('mylogger');
self::assertEquals(LoggerLevel::getLevelInfo(),
$logger->getLevel());
+ $logger = Logger::getLogger('tracer');
+ self::assertEquals(LoggerLevel::getLevelTrace(),
$logger->getLevel());
}
}
Modified:
incubator/log4php/trunk/src/test/php/configurators/LoggerConfiguratorXmlTest.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/test/php/configurators/LoggerConfiguratorXmlTest.php?rev=912120&r1=912119&r2=912120&view=diff
==============================================================================
---
incubator/log4php/trunk/src/test/php/configurators/LoggerConfiguratorXmlTest.php
(original)
+++
incubator/log4php/trunk/src/test/php/configurators/LoggerConfiguratorXmlTest.php
Sat Feb 20 14:26:12 2010
@@ -55,6 +55,10 @@
$logger = Logger::getLogger('mylogger');
self::assertEquals(LoggerLevel::getLevelInfo(),
$logger->getLevel());
+
+ $logger = Logger::getLogger('tracer');
+ self::assertEquals(LoggerLevel::getLevelTrace(),
$logger->getLevel());
+
}
public function testThreshold() {
Modified: incubator/log4php/trunk/src/test/php/configurators/test1.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/test/php/configurators/test1.php?rev=912120&r1=912119&r2=912120&view=diff
==============================================================================
--- incubator/log4php/trunk/src/test/php/configurators/test1.php (original)
+++ incubator/log4php/trunk/src/test/php/configurators/test1.php Sat Feb 20
14:26:12 2010
@@ -28,6 +28,10 @@
'level' => 'INFO',
'appenders' => array('default'),
),
+ 'tracer' => array(
+ 'level' => 'TRACE',
+ 'appenders' => array('default'),
+ ),
),
'appenders' => array(
'default' => array(
Modified: incubator/log4php/trunk/src/test/php/configurators/test1.properties
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/test/php/configurators/test1.properties?rev=912120&r1=912119&r2=912120&view=diff
==============================================================================
--- incubator/log4php/trunk/src/test/php/configurators/test1.properties
(original)
+++ incubator/log4php/trunk/src/test/php/configurators/test1.properties Sat Feb
20 14:26:12 2010
@@ -16,6 +16,8 @@
log4php.appender.default = LoggerAppenderEcho
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: incubator/log4php/trunk/src/test/php/configurators/test1.xml
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/test/php/configurators/test1.xml?rev=912120&r1=912119&r2=912120&view=diff
==============================================================================
--- incubator/log4php/trunk/src/test/php/configurators/test1.xml (original)
+++ incubator/log4php/trunk/src/test/php/configurators/test1.xml Sat Feb 20
14:26:12 2010
@@ -29,6 +29,9 @@
</filter>
<filter class="LoggerFilterDenyAll" />
</appender>
+ <logger name="tracer">
+ <level value="trace"/>
+ </logger>
<logger name="mylogger">
<level value="info"/>
</logger>
