diff --git a/framework/yii/debug/LogTarget.php b/framework/yii/debug/LogTarget.php index 98c2624..3e36cd5 100644 --- a/framework/yii/debug/LogTarget.php +++ b/framework/yii/debug/LogTarget.php @@ -50,7 +50,8 @@ class LogTarget extends Target $manifest = json_decode(file_get_contents($indexFile), true); } $request = Yii::$app->getRequest(); - $manifest[$this->tag] = array( + $manifest[$this->tag] = $summary = array( + 'tag' => $this->tag, 'url' => $request->getAbsoluteUrl(), 'ajax' => $request->getIsAjax(), 'method' => $request->getMethod(), @@ -64,6 +65,7 @@ class LogTarget extends Target foreach ($this->module->panels as $id => $panel) { $data[$id] = $panel->save(); } + $data['summary'] = $summary; file_put_contents($dataFile, json_encode($data)); file_put_contents($indexFile, json_encode($manifest)); } @@ -86,7 +88,7 @@ class LogTarget extends Target protected function gc(&$manifest) { - if (rand(0, 100) < 5 && count($manifest) > $this->module->historySize) { + if (count($manifest) > $this->module->historySize + 10) { $n = count($manifest) - $this->module->historySize; foreach (array_keys($manifest) as $tag) { $file = $this->module->dataPath . "/$tag.json"; diff --git a/framework/yii/debug/controllers/DefaultController.php b/framework/yii/debug/controllers/DefaultController.php index d4102ee..dd01412 100644 --- a/framework/yii/debug/controllers/DefaultController.php +++ b/framework/yii/debug/controllers/DefaultController.php @@ -17,9 +17,15 @@ use yii\web\HttpException; */ class DefaultController extends Controller { - /** @var \yii\debug\Module */ - public $module; public $layout = 'main'; + /** + * @var \yii\debug\Module + */ + public $module; + /** + * @var array the summary data (e.g. URL, time) + */ + public $summary; public function actionIndex() { @@ -34,7 +40,7 @@ class DefaultController extends Controller $tags = array_keys($this->getManifest()); $tag = reset($tags); } - $meta = $this->loadData($tag); + $this->loadData($tag); if (isset($this->module->panels[$panel])) { $activePanel = $this->module->panels[$panel]; } else { @@ -42,7 +48,7 @@ class DefaultController extends Controller } return $this->render('view', array( 'tag' => $tag, - 'meta' => $meta, + 'summary' => $this->summary, 'manifest' => $this->getManifest(), 'panels' => $this->module->panels, 'activePanel' => $activePanel, @@ -93,7 +99,7 @@ class DefaultController extends Controller unset($this->module->panels[$id]); } } - return $manifest[$tag]; + $this->summary = $data['summary']; } else { throw new HttpException(404, "Unable to find debug data tagged with '$tag'."); } diff --git a/framework/yii/debug/views/default/view.php b/framework/yii/debug/views/default/view.php index 9775880..e71e13e 100644 --- a/framework/yii/debug/views/default/view.php +++ b/framework/yii/debug/views/default/view.php @@ -4,7 +4,7 @@ use yii\helpers\Html; /** * @var \yii\base\View $this - * @var array $meta + * @var array $summary * @var string $tag * @var array $manifest * @var \yii\debug\Panel[] $panels @@ -51,11 +51,11 @@ $this->title = 'Yii Debugger';
- Debugging: - - - - at - by + : + + 'label')); ?> + + at + by getDetail(); ?>