Skip to content

Commit

Permalink
unify other log types as well
Browse files Browse the repository at this point in the history
  • Loading branch information
euromark committed Jun 21, 2013
1 parent 24506dc commit 8141dd2
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions lib/Cake/Console/Shell.php
Original file line number Diff line number Diff line change
Expand Up @@ -878,12 +878,12 @@ protected function _useLogger($enable = true) {
return;
}
CakeLog::config('stdout', array(
'engine' => 'ConsoleLog',
'engine' => 'Console',
'types' => array('notice', 'info'),
'stream' => $this->stdout,
));
CakeLog::config('stderr', array(
'engine' => 'ConsoleLog',
'engine' => 'Console',
'types' => array('emergency', 'alert', 'critical', 'error', 'warning', 'debug'),
'stream' => $this->stderr,
));
Expand Down
2 changes: 1 addition & 1 deletion lib/Cake/Log/Engine/SyslogLog.php
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class SyslogLog extends BaseLog {
*
* {{{
* CakeLog::config('error', array(
* 'engine' => 'SyslogLog',
* 'engine' => 'Syslog',
* 'types' => array('emergency', 'alert', 'critical', 'error'),
* 'format' => "%s: My-App - %s",
* 'prefix' => 'Web Server 01'
Expand Down
2 changes: 1 addition & 1 deletion lib/Cake/Test/Case/Console/ShellTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -855,7 +855,7 @@ public function testFileAndConsoleLogging() {
array('types' => 'error'),
));
TestCakeLog::config('console', array(
'engine' => 'ConsoleLog',
'engine' => 'Console',
'stream' => 'php://stderr',
));
TestCakeLog::replace('console', $mock);
Expand Down
6 changes: 3 additions & 3 deletions lib/Cake/Test/Case/Log/Engine/ConsoleLogTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public function tearDown() {
*/
public function testConsoleOutputWrites() {
TestCakeLog::config('test_console_log', array(
'engine' => 'TestConsoleLog',
'engine' => 'TestConsole',
));

$mock = $this->getMock('TestConsoleLog', array('write'), array(
Expand All @@ -97,7 +97,7 @@ public function testConsoleOutputWrites() {
*/
public function testCombinedLogWriting() {
TestCakeLog::config('test_console_log', array(
'engine' => 'TestConsoleLog',
'engine' => 'TestConsole',
));
$mock = $this->getMock('TestConsoleLog', array('write'), array(
array('types' => 'error'),
Expand Down Expand Up @@ -133,7 +133,7 @@ public function testCombinedLogWriting() {
*/
public function testDefaultOutputAs() {
TestCakeLog::config('test_console_log', array(
'engine' => 'TestConsoleLog',
'engine' => 'TestConsole',
));
if (DS === '\\' && !(bool)env('ANSICON')) {
$expected = ConsoleOutput::PLAIN;
Expand Down

0 comments on commit 8141dd2

Please sign in to comment.