Browse Source

Removed yii\debug\Module::enabled.

tags/2.0.0-beta
Qiang Xue 12 years ago
parent
commit
9193e4777c
  1. 17
      apps/basic/config/web.php
  2. 13
      framework/yii/debug/Module.php

17
apps/basic/config/web.php

@ -1,15 +1,8 @@
<?php <?php
return array( $config = array(
'id' => 'bootstrap', 'id' => 'bootstrap',
'basePath' => dirname(__DIR__), 'basePath' => dirname(__DIR__),
'preload' => array('debug'),
'modules' => array(
'debug' => array(
'class' => 'yii\debug\Module',
'enabled' => YII_ENV_DEV,
),
),
'components' => array( 'components' => array(
'cache' => array( 'cache' => array(
'class' => 'yii\caching\FileCache', 'class' => 'yii\caching\FileCache',
@ -32,3 +25,11 @@ return array(
), ),
'params' => require(__DIR__ . '/params.php'), 'params' => require(__DIR__ . '/params.php'),
); );
if (YII_ENV_DEV) {
$config['preload'][] = 'debug';
$config['modules']['debug'] = 'yii\debug\Module';
$config['modules']['gii'] = 'yii\gii\Module';
}
return $config;

13
framework/yii/debug/Module.php

@ -25,7 +25,9 @@ class Module extends \yii\base\Module
* by localhost. * by localhost.
*/ */
public $allowedIPs = array('127.0.0.1', '::1'); public $allowedIPs = array('127.0.0.1', '::1');
/**
* @var string the namespace that controller classes are in.
*/
public $controllerNamespace = 'yii\debug\controllers'; public $controllerNamespace = 'yii\debug\controllers';
/** /**
* @var LogTarget * @var LogTarget
@ -39,15 +41,16 @@ class Module extends \yii\base\Module
* @var string the directory storing the debugger data files. This can be specified using a path alias. * @var string the directory storing the debugger data files. This can be specified using a path alias.
*/ */
public $dataPath = '@runtime/debug'; public $dataPath = '@runtime/debug';
/**
* @var integer the maximum number of debug data files to keep. If there are more files generated,
* the oldest ones will be removed.
*/
public $historySize = 50; public $historySize = 50;
public $enabled = true;
public function init() public function init()
{ {
parent::init(); parent::init();
if (!$this->enabled) {
return;
}
$this->dataPath = Yii::getAlias($this->dataPath); $this->dataPath = Yii::getAlias($this->dataPath);
$this->logTarget = Yii::$app->getLog()->targets['debug'] = new LogTarget($this); $this->logTarget = Yii::$app->getLog()->targets['debug'] = new LogTarget($this);
Yii::$app->getView()->on(View::EVENT_END_BODY, array($this, 'renderToolbar')); Yii::$app->getView()->on(View::EVENT_END_BODY, array($this, 'renderToolbar'));

Loading…
Cancel
Save