修正未指定base path问题

NufangTechnology · Dec 19, 2018 · bea81c0 · bea81c0
1 parent 43c8c4c
commit bea81c0
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/src/Adapter/Stream.php b/src/Adapter/Stream.php
@@ -51,14 +51,19 @@ class Stream extends Adapter
      */
     protected $_logExt = '.log';
 
+    /**
+     * @var string
+     */
+    protected $_basePath;
+
     /**
      * Stream constructor.
      *
      * @param string $name
      * @param null|array $options
      * @throws Exception
      */
-    public function __construct($name = '', $options = null)
+    public function __construct($basePath, $name = '', $options = null)
     {
         $mode = 'ab';
 
@@ -78,7 +83,15 @@ public function __construct($name = '', $options = null)
             $this->_split = false;
         }
 
-        $this->_mode = $mode;
+        if (empty($basePath)) {
+            throw new Exception('Base path is required');
+        }
+        if (!is_dir($basePath)) {
+            throw new Exception("'{$basePath}' is not exists");
+        }
+
+        $this->_basePath = trim($basePath, '/');
+        $this->_mode     = $mode;
     }
 
     /**
@@ -130,7 +143,8 @@ public function getStream()
      */
     protected function createStream($name, $model)
     {
-        $stream = fopen($name, $model);
+        $file   = $this->_basePath . '/' . $name;
+        $stream = fopen($file, $model);
         if (!$stream) {
             throw new Exception("Can't open stream '" . $this->_name . "'");
         }

diff --git a/src/Formatter/Json.php b/src/Formatter/Json.php
@@ -1,7 +1,6 @@
 <?php
 namespace Bee\Logger\Formatter;
 
-use Bee\Logger\Exception;
 use Phalcon\Logger\Formatter;
 use Bee\Logger\Processor\ProcessIdProcessor;