Browse Source

Fixes issue #177.

tags/2.0.0-beta
Qiang Xue 12 years ago
parent
commit
2dd51d5b46
  1. 10
      apps/bootstrap/protected/config/main.php
  2. 1
      framework/base/Application.php
  3. 6
      framework/logging/Logger.php
  4. 13
      framework/logging/Router.php

10
apps/bootstrap/protected/config/main.php

@ -3,6 +3,7 @@
return array( return array(
'id' => 'hello', 'id' => 'hello',
'basePath' => dirname(__DIR__), 'basePath' => dirname(__DIR__),
'preload' => array('log'),
'components' => array( 'components' => array(
'cache' => array( 'cache' => array(
'class' => 'yii\caching\FileCache', 'class' => 'yii\caching\FileCache',
@ -14,6 +15,15 @@ return array(
'assetManager' => array( 'assetManager' => array(
'bundles' => require(__DIR__ . '/assets.php'), 'bundles' => require(__DIR__ . '/assets.php'),
), ),
'log' => array(
'class' => 'yii\logging\Router',
'targets' => array(
'file' => array(
'class' => 'yii\logging\FileTarget',
'levels' => array('error', 'warning'),
),
),
),
), ),
'params' => array( 'params' => array(
'adminEmail' => 'admin@example.com', 'adminEmail' => 'admin@example.com',

1
framework/base/Application.php

@ -8,7 +8,6 @@
namespace yii\base; namespace yii\base;
use Yii; use Yii;
use yii\helpers\FileHelper;
/** /**
* Application is the base class for all application classes. * Application is the base class for all application classes.

6
framework/logging/Logger.php

@ -6,7 +6,9 @@
*/ */
namespace yii\logging; namespace yii\logging;
use yii\base\InvalidConfigException;
use \yii\base\Component;
use \yii\base\InvalidConfigException;
/** /**
* Logger records logged messages in memory. * Logger records logged messages in memory.
@ -17,7 +19,7 @@ use yii\base\InvalidConfigException;
* @author Qiang Xue <qiang.xue@gmail.com> * @author Qiang Xue <qiang.xue@gmail.com>
* @since 2.0 * @since 2.0
*/ */
class Logger extends \yii\base\Component class Logger extends Component
{ {
/** /**
* Error message level. An error message is one that indicates the abnormal termination of the * Error message level. An error message is one that indicates the abnormal termination of the

13
framework/logging/Router.php

@ -28,16 +28,16 @@ use yii\base\Application;
* 'preload' => array('log'), * 'preload' => array('log'),
* 'components' => array( * 'components' => array(
* 'log' => array( * 'log' => array(
* 'class' => '\yii\logging\Router', * 'class' => 'yii\logging\Router',
* 'targets' => array( * 'targets' => array(
* 'file' => array( * 'file' => array(
* 'class' => '\yii\logging\FileTarget', * 'class' => 'yii\logging\FileTarget',
* 'levels' => 'trace, info', * 'levels' => array('trace', 'info'),
* 'categories' => 'yii\*', * 'categories' => array('yii\*'),
* ), * ),
* 'email' => array( * 'email' => array(
* 'class' => '\yii\logging\EmailTarget', * 'class' => 'yii\logging\EmailTarget',
* 'levels' => 'error, warning', * 'levels' => array('error', 'warning'),
* 'emails' => array('admin@example.com'), * 'emails' => array('admin@example.com'),
* ), * ),
* ), * ),
@ -73,7 +73,6 @@ class Router extends Component
public function init() public function init()
{ {
parent::init(); parent::init();
foreach ($this->targets as $name => $target) { foreach ($this->targets as $name => $target) {
if (!$target instanceof Target) { if (!$target instanceof Target) {
$this->targets[$name] = Yii::createObject($target); $this->targets[$name] = Yii::createObject($target);

Loading…
Cancel
Save