Future add data source

src/LogTarget.php

@@ -1,8 +1,8 @@
 <?php
 /**
- * @link http://www.yiiframework.com/
+ * @link      http://www.yiiframework.com/
  * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
+ * @license   http://www.yiiframework.com/license/
  */
 
 namespace yii\debug;
@@ -16,7 +16,7 @@
  * The debug LogTarget is used to store logs for later use in the debugger tool
  *
  * @author Qiang Xue <[email protected]>
- * @since 2.0
+ * @since  2.0
  */
 class LogTarget extends Target
 {
@@ -32,7 +32,7 @@ class LogTarget extends Target
 
     /**
      * @param \yii\debug\Module $module
-     * @param array $config
+     * @param array             $config
      */
     public function __construct($module, $config = [])
     {
@@ -44,17 +44,16 @@ public function __construct($module, $config = [])
     /**
      * Exports log messages to a specific destination.
      * Child classes must implement this method.
+     *
      * @throws \yii\base\Exception
      */
     public function export()
     {
-        $path = $this->module->dataPath;
-        FileHelper::createDirectory($path, $this->module->dirMode);
-
         $summary = $this->collectSummary();
-        $dataFile = "$path/{$this->tag}.data";
+
         $data = [];
         $exceptions = [];
+
         foreach ($this->module->panels as $id => $panel) {
             try {
                 $panelData = $panel->save();
@@ -70,47 +69,25 @@ public function export()
         $data['summary'] = $summary;
         $data['exceptions'] = $exceptions;
 
-        file_put_contents($dataFile, serialize($data));
-        if ($this->module->fileMode !== null) {
-            @chmod($dataFile, $this->module->fileMode);
-        }
-
-        $indexFile = "$path/index.data";
-        $this->updateIndexFile($indexFile, $summary);
+        $this->module->getDataStorage()->setData($this->tag, $data);
     }
 
     /**
-     * @see DefaultController
      * @return array
+     * @see DefaultController
      */
     public function loadManifest()
     {
-        $indexFile = $this->module->dataPath . '/index.data';
-
-        $content = '';
-        $fp = @fopen($indexFile, 'r');
-        if ($fp !== false) {
-            @flock($fp, LOCK_SH);
-            $content = fread($fp, filesize($indexFile));
-            @flock($fp, LOCK_UN);
-            fclose($fp);
-        }
-
-        if ($content !== '') {
-            return array_reverse(unserialize($content), true);
-        }
-
-        return [];
+        return $this->module->getDataStorage()->getDataManifest();
     }
 
     /**
-     * @see DefaultController
      * @return array
+     * @see DefaultController
      */
     public function loadTagToPanels($tag)
     {
-        $dataFile = $this->module->dataPath . "/$tag.data";
-        $data = unserialize(file_get_contents($dataFile));
+        $data = $this->module->getDataStorage()->getData($tag);
         $exceptions = $data['exceptions'];
         foreach ($this->module->panels as $id => $panel) {
             if (isset($data[$id])) {
@@ -125,52 +102,16 @@ public function loadTagToPanels($tag)
         return $data;
     }
 
-    /**
-     * Updates index file with summary log data
-     *
-     * @param string $indexFile path to index file
-     * @param array $summary summary log data
-     * @throws \yii\base\InvalidConfigException
-     */
-    private function updateIndexFile($indexFile, $summary)
-    {
-        if (!@touch($indexFile) || ($fp = @fopen($indexFile, 'r+')) === false) {
-            throw new InvalidConfigException("Unable to open debug data index file: $indexFile");
-        }
-        @flock($fp, LOCK_EX);
-        $manifest = '';
-        while (($buffer = fgets($fp)) !== false) {
-            $manifest .= $buffer;
-        }
-        if (!feof($fp) || empty($manifest)) {
-            // error while reading index data, ignore and create new
-            $manifest = [];
-        } else {
-            $manifest = unserialize($manifest);
-        }
-
-        $manifest[$this->tag] = $summary;
-        $this->gc($manifest);
-
-        ftruncate($fp, 0);
-        rewind($fp);
-        fwrite($fp, serialize($manifest));
-
-        @flock($fp, LOCK_UN);
-        @fclose($fp);
-
-        if ($this->module->fileMode !== null) {
-            @chmod($indexFile, $this->module->fileMode);
-        }
-    }
 
     /**
      * Processes the given log messages.
      * This method will filter the given messages with [[levels]] and [[categories]].
      * And if requested, it will also export the filtering result to specific medium (e.g. email).
+     *
      * @param array $messages log messages to be processed. See [[\yii\log\Logger::messages]] for the structure
-     * of each message.
-     * @param bool $final whether this method is called at the end of the current application
+     *                        of each message.
+     * @param bool  $final    whether this method is called at the end of the current application
+     *
      * @throws \yii\base\Exception
      */
     public function collect($messages, $final)
@@ -181,56 +122,9 @@ public function collect($messages, $final)
         }
     }
 
-    /**
-     * Removes obsolete data files
-     * @param array $manifest
-     */
-    protected function gc(&$manifest)
-    {
-        if (count($manifest) > $this->module->historySize + 10) {
-            $n = count($manifest) - $this->module->historySize;
-            foreach (array_keys($manifest) as $tag) {
-                $file = $this->module->dataPath . "/$tag.data";
-                @unlink($file);
-                if (isset($manifest[$tag]['mailFiles'])) {
-                    foreach ($manifest[$tag]['mailFiles'] as $mailFile) {
-                        @unlink(Yii::getAlias($this->module->panels['mail']->mailPath) . "/$mailFile");
-                    }
-                }
-                unset($manifest[$tag]);
-                if (--$n <= 0) {
-                    break;
-                }
-            }
-            $this->removeStaleDataFiles($manifest);
-        }
-    }
-
-    /**
-     * Remove staled data files i.e. files that are not in the current index file
-     * (may happen because of corrupted or rotated index file)
-     *
-     * @param array $manifest
-     * @since 2.0.11
-     */
-    protected function removeStaleDataFiles($manifest)
-    {
-        $storageTags = array_map(
-            function ($file) {
-                return pathinfo($file, PATHINFO_FILENAME);
-            },
-            FileHelper::findFiles($this->module->dataPath, ['except' => ['index.data']])
-        );
-
-        $staledTags = array_diff($storageTags, array_keys($manifest));
-
-        foreach ($staledTags as $tag) {
-            @unlink($this->module->dataPath . "/$tag.data");
-        }
-    }
-
     /**
      * Collects summary data of current request.
+     *
      * @return array
      */
     protected function collectSummary()
@@ -244,7 +138,7 @@ protected function collectSummary()
         $summary = [
             'tag' => $this->tag,
             'url' => $request->getAbsoluteUrl(),
-            'ajax' => (int) $request->getIsAjax(),
+            'ajax' => (int)$request->getIsAjax(),
             'method' => $request->getMethod(),
             'ip' => $request->getUserIP(),
             'time' => $_SERVER['REQUEST_TIME_FLOAT'],
@@ -264,6 +158,7 @@ protected function collectSummary()
     /**
      * Returns total sql count executed in current request. If database panel is not configured
      * returns 0.
+     *
      * @return int
      */
     protected function getSqlTotalCount()

src/Module.php

@@ -10,11 +10,14 @@
 use Yii;
 use yii\base\Application;
 use yii\base\BootstrapInterface;
+use yii\debug\components\data\DataStorage;
+use yii\debug\components\data\FileDataStorage;
 use yii\helpers\Html;
 use yii\helpers\IpHelper;
 use yii\helpers\Json;
 use yii\helpers\Url;
 use yii\web\ForbiddenHttpException;
+use yii\base\InvalidConfigException;
 use yii\web\Response;
 use yii\web\View;
 
@@ -76,30 +79,19 @@ class Module extends \yii\base\Module implements BootstrapInterface
      * @since 2.0.7
      */
     public $defaultPanel = 'log';
+
     /**
-     * @var string the directory storing the debugger data files. This can be specified using a path alias.
-     */
-    public $dataPath = '@runtime/debug';
-    /**
-     * @var int the permission to be set for newly created debugger data files.
-     * This value will be used by PHP [[chmod()]] function. No umask will be applied.
-     * If not set, the permission will be determined by the current environment.
-     * @since 2.0.6
-     */
-    public $fileMode;
-    /**
-     * @var int the permission to be set for newly created directories.
-     * This value will be used by PHP [[chmod()]] function. No umask will be applied.
-     * Defaults to 0775, meaning the directory is read-writable by owner and group,
-     * but read-only for other users.
-     * @since 2.0.6
+     * @var DataStorage
      */
-    public $dirMode = 0775;
+    private $dataStorage;
+
     /**
-     * @var int the maximum number of debug data files to keep. If there are more files generated,
-     * the oldest ones will be removed.
+     * @var string[]
      */
-    public $historySize = 50;
+    public $dataStorageConfig = [
+        'class' => 'yii\debug\components\data\FileDataStorage',
+    ];
+
     /**
      * @var int the debug bar default height, as a percentage of the total screen height
      * @since 2.1.1
@@ -220,11 +212,18 @@ public static function setYiiLogo($logo)
     public function init()
     {
         parent::init();
-        $this->dataPath = Yii::getAlias($this->dataPath);
 
         if (Yii::$app instanceof \yii\web\Application) {
             $this->initPanels();
         }
+
+        $dataStorage = Yii::createObject($this->dataStorageConfig + ['module' => $this]);
+
+        if (!$dataStorage instanceof DataStorage) {
+            throw new InvalidConfigException();
+        }
+
+        $this->dataStorage = $dataStorage;
     }
 
     /**
@@ -503,4 +502,12 @@ public function htmlTitle()
 
         return 'Yii Debugger';
     }
+
+    /**
+     * @return DataStorage
+     */
+    public function getDataStorage()
+    {
+        return $this->dataStorage;
+    }
 }