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/08/27 08:05:37 UTC
svn commit: r808287 - in /incubator/log4php/trunk/src:
main/php/appenders/LoggerAppenderRollingFile.php
test/php/appenders/LoggerAppenderRollingFileTest.php
Author: grobmeier
Date: Thu Aug 27 06:05:36 2009
New Revision: 808287
URL: http://svn.apache.org/viewvc?rev=808287&view=rev
Log:
returning filesize for testing proposes, improved testcase
Modified:
incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderRollingFile.php
incubator/log4php/trunk/src/test/php/appenders/LoggerAppenderRollingFileTest.php
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=808287&r1=808286&r2=808287&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderRollingFile.php (original)
+++ incubator/log4php/trunk/src/main/php/appenders/LoggerAppenderRollingFile.php Thu Aug 27 06:05:36 2009
@@ -165,9 +165,10 @@
*
* @param mixed $maxFileSize
* @see setMaxFileSize()
+ * @deprecated
*/
public function setMaximumFileSize($maxFileSize) {
- $this->setMaxFileSize($maxFileSize);
+ return $this->setMaxFileSize($maxFileSize);
}
/**
@@ -181,6 +182,7 @@
* as 10240.
*
* @param mixed $value
+ * @return the actual file size set
*/
public function setMaxFileSize($value) {
$maxFileSize = null;
@@ -197,10 +199,10 @@
}
}
- if($maxFileSize === null) {
- } else {
+ if($maxFileSize !== null) {
$this->maxFileSize = abs($maxFileSize);
}
+ return $this->maxFileSize;
}
/**
Modified: incubator/log4php/trunk/src/test/php/appenders/LoggerAppenderRollingFileTest.php
URL: http://svn.apache.org/viewvc/incubator/log4php/trunk/src/test/php/appenders/LoggerAppenderRollingFileTest.php?rev=808287&r1=808286&r2=808287&view=diff
==============================================================================
--- incubator/log4php/trunk/src/test/php/appenders/LoggerAppenderRollingFileTest.php (original)
+++ incubator/log4php/trunk/src/test/php/appenders/LoggerAppenderRollingFileTest.php Thu Aug 27 06:05:36 2009
@@ -33,8 +33,46 @@
if(file_exists('../../../target/temp/phpunit/TEST-rolling.txt.1')) {
unlink('../../../target/temp/phpunit/TEST-rolling.txt.1');
}
+
+ if(file_exists('../../../target/temp/phpunit/TEST-rolling.txt.2')) {
+ unlink('../../../target/temp/phpunit/TEST-rolling.txt.2');
+ }
}
+ public function testMaxFileSize() {
+ $appender = new LoggerAppenderRollingFile("mylogger");
+
+ $e = $appender->setMaxFileSize('1KB');
+ self::assertEquals($e, '1024');
+
+ $e = $appender->setMaxFileSize('2KB');
+ self::assertEquals($e, '2048');
+
+ $e = $appender->setMaxFileSize('1MB');
+ self::assertEquals($e, '1048576');
+
+ $e = $appender->setMaxFileSize('3MB');
+ self::assertEquals($e, '3145728');
+
+ $e = $appender->setMaxFileSize('1GB');
+ self::assertEquals($e, '1073741824');
+
+ $e = $appender->setMaxFileSize('10000');
+ self::assertEquals($e, '10000');
+
+ $e = $appender->setMaxFileSize('BLUB');
+ self::assertEquals($e, '10000');
+
+ $e = $appender->setMaxFileSize('100.5');
+ self::assertEquals($e, '100');
+
+ $e = $appender->setMaxFileSize('1000.6');
+ self::assertEquals($e, '1000');
+
+ $e = $appender->setMaxFileSize('1.5MB');
+ self::assertEquals($e, '1048576');
+ }
+
public function testSimpleLogging() {
$layout = new LoggerLayoutSimple();
@@ -42,6 +80,7 @@
$appender->setFileName('../../../target/temp/phpunit/TEST-rolling.txt');
$appender->setLayout($layout);
$appender->setMaximumFileSize('1KB');
+ $appender->setMaxBackupIndex(2);
$appender->activateOptions();
$event = new LoggerLoggingEvent('LoggerAppenderFileTest',
@@ -80,6 +119,18 @@
foreach($data as $r) {
self::assertEquals($e, $r);
}
+
+ $file = '../../../target/temp/phpunit/TEST-rolling.txt.2';
+ $data = file($file);
+ $line = $data[count($data)-1];
+ $e = "WARN - my message123".PHP_EOL;
+ foreach($data as $r) {
+ self::assertEquals($e, $r);
+ }
+
+ if(file_exists('../../../target/temp/phpunit/TEST-rolling.txt.3')) {
+ self::assertTrue(false);
+ }
}
protected function tearDown() {