mirror/php-monolog
1
0
Fork 0
mirror of https://github.com/Seldaek/monolog.git synced 2025-08-05 04:37:38 +02:00
Code Issues Releases Wiki Activity

Simplified message levels

Browse Source
This commit is contained in:
Jordi Boggiano
2011-02-18 00:44:21 +01:00
parent 5411d236c1
commit 594ed9cdcb
5 changed files with 25 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Monolog/Log.php
View File

@@ -19,7 +19,7 @@ class Log
protected $name; protected $name;
protected $writers; protected $writers;
public function __construct($name, $level = Logger::WARN, $writers = array()) public function __construct($name, $level = Logger::WARNING, $writers = array())
{ {
$this->name = $name; $this->name = $name;
$this->level = $level; $this->level = $level;

22
src/Monolog/Logger.php
View File

@@ -13,18 +13,16 @@ namespace Monolog;
class Logger class Logger
{ {
const DEBUG = 1; const DEBUG = 100;
const INFO = 5; const INFO = 200;
const WARN = 10; const WARNING = 300;
const ERROR = 15; const ERROR = 400;
const FATAL = 20;
protected static $levels = array( protected static $levels = array(
1 => 'DEBUG', 100 => 'DEBUG',
5 => 'INFO', 200 => 'INFO',
10 => 'WARN', 300 => 'WARNING',
15 => 'ERROR', 400 => 'ERROR',
20 => 'FATAL',
); );
protected $logs; protected $logs;
@@ -69,7 +67,7 @@ class Logger
public function addWarning($message, $log = null) public function addWarning($message, $log = null)
{ {
$this->addMessage(self::WARN, $message, $log); $this->addMessage(self::WARNING, $message, $log);
} }
public function addError($message, $log = null) public function addError($message, $log = null)
@@ -101,7 +99,7 @@ class Logger
public function warn($message, $log = null) public function warn($message, $log = null)
{ {
$this->addMessage(self::WARN, $message, $log); $this->addMessage(self::WARNING, $message, $log);
} }
public function err($message, $log = null) public function err($message, $log = null)

10
tests/Monolog/Formatter/SimpleFormatterTest.php
View File

@@ -18,18 +18,18 @@ class SimpleFormatterTest extends \PHPUnit_Framework_TestCase
public function testDefFormatWithString() public function testDefFormatWithString()
{ {
$formatter = new SimpleFormatter(null, 'Y-m-d'); $formatter = new SimpleFormatter(null, 'Y-m-d');
$message = $formatter->format('log', Logger::WARN, 'foo'); $message = $formatter->format('log', Logger::WARNING, 'foo');
$this->assertEquals('['.date('Y-m-d').'] log.WARN: foo'."\n", $message); $this->assertEquals('['.date('Y-m-d').'] log.WARNING: foo'."\n", $message);
} }
public function testDefFormatWithArray() public function testDefFormatWithArray()
{ {
$formatter = new SimpleFormatter(null, 'Y-m-d'); $formatter = new SimpleFormatter(null, 'Y-m-d');
$message = $formatter->format('xx', Logger::FATAL, array( $message = $formatter->format('xx', Logger::ERROR, array(
'log' => 'log', 'log' => 'log',
'level' => 'WARN', 'level' => 'WARNING',
'message' => 'foo' 'message' => 'foo'
)); ));
$this->assertEquals('['.date('Y-m-d').'] log.WARN: foo'."\n", $message); $this->assertEquals('['.date('Y-m-d').'] log.WARNING: foo'."\n", $message);
} }
} }

12
tests/Monolog/LogTest.php
View File

@@ -19,26 +19,26 @@ class LogTest extends \PHPUnit_Framework_TestCase
$writer1 = $this->getMock('Monolog\Writer\NullWriter', array('write')); $writer1 = $this->getMock('Monolog\Writer\NullWriter', array('write'));
$writer1->expects($this->once()) $writer1->expects($this->once())
->method('write') ->method('write')
->with('bob', Logger::WARN, 'test'); ->with('bob', Logger::WARNING, 'test');
$writer2 = $this->getMock('Monolog\Writer\NullWriter', array('write')); $writer2 = $this->getMock('Monolog\Writer\NullWriter', array('write'));
$writer2->expects($this->once()) $writer2->expects($this->once())
->method('write') ->method('write')
->with('bob', Logger::WARN, 'test'); ->with('bob', Logger::WARNING, 'test');
$logger->addWriter($writer1); $logger->addWriter($writer1);
$logger->addWriter($writer2); $logger->addWriter($writer2);
$logger->addMessage(Logger::WARN, 'test'); $logger->addMessage(Logger::WARNING, 'test');
} }
public function testLogLowLevel() public function testLogLowLevel()
{ {
$logger = new Log('bob'); $logger = new Log('bob');
$logger->setLevel(Logger::FATAL); $logger->setLevel(Logger::ERROR);
$this->assertEquals(Logger::FATAL, $logger->getLevel()); $this->assertEquals(Logger::ERROR, $logger->getLevel());
$writer1 = $this->getMock('Monolog\Writer\NullWriter', array('write')); $writer1 = $this->getMock('Monolog\Writer\NullWriter', array('write'));
$writer1->expects($this->never()) $writer1->expects($this->never())
->method('write'); ->method('write');
$logger->addWriter($writer1); $logger->addWriter($writer1);
$logger->addMessage(Logger::WARN, 'test'); $logger->addMessage(Logger::WARNING, 'test');
} }
} }

6
tests/Monolog/Writer/StreamWriterTest.php
View File

@@ -19,9 +19,9 @@ class StreamWritterTest extends \PHPUnit_Framework_TestCase
{ {
$handle = fopen('php://memory', 'a+'); $handle = fopen('php://memory', 'a+');
$writer = new StreamWriter($handle); $writer = new StreamWriter($handle);
$writer->write('log', Logger::WARN, 'test'); $writer->write('log', Logger::WARNING, 'test');
$writer->write('log', Logger::WARN, 'test2'); $writer->write('log', Logger::WARNING, 'test2');
$writer->write('log', Logger::WARN, 'test3'); $writer->write('log', Logger::WARNING, 'test3');
fseek($handle, 0); fseek($handle, 0);
$this->assertEquals('testtest2test3', fread($handle, 100)); $this->assertEquals('testtest2test3', fread($handle, 100));
} }