Fixed merging messages and file save when multiple log method was exe…

…cuted
bluetree-service · Aug 13, 2018 · 02bc0cb · 02bc0cb
1 parent 16fb8d5
commit 02bc0cb
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 8 deletions.
diff --git a/doc/changelog.md b/doc/changelog.md
@@ -1,6 +1,10 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## 0.7.2.0 - 2018-08-13
+### Changed
+* Fixed merging messages and file save when multiple log method was executed
+
 ## 0.7.1.1 - 2018-01-21
 ### Changed
 * Fixed composer dependencies

diff --git a/src/Log.php b/src/Log.php
@@ -8,6 +8,8 @@
 use Psr\Log\InvalidArgumentException;
 use SimpleLog\Storage\StorageInterface;
 use SimpleLog\Message\MessageInterface;
+use SimpleLog\Storage\File;
+use SimpleLog\Message\DefaultMessage;
 
 class Log implements LogInterface, LoggerInterface
 {
@@ -19,12 +21,12 @@ class Log implements LogInterface, LoggerInterface
     protected $defaultParams = [
         'log_path' => './log',
         'level' => 'notice',
-        'storage' => \SimpleLog\Storage\File::class,
-        'message' => \SimpleLog\Message\DefaultMessage::class,
+        'storage' => File::class,
+        'message' => DefaultMessage::class,
     ];
 
     /**
-     * @var \SimpleLog\Storage\StorageInterface
+     * @var StorageInterface
      */
     protected $storage;
 
@@ -34,10 +36,15 @@ class Log implements LogInterface, LoggerInterface
     protected $levels = [];
 
     /**
-     * @var \SimpleLog\Message\MessageInterface
+     * @var MessageInterface
      */
     protected $message;
 
+    /**
+     * @var MessageInterface
+     */
+    protected $lastMessage;
+
     /**
      * @param array $params
      * @throws \ReflectionException
@@ -71,7 +78,7 @@ public function makeLog($message, array $context = [])
      * @param string $level
      * @param string|array|object $message
      * @param array $context
-     * @throws \Psr\Log\InvalidArgumentException
+     * @throws InvalidArgumentException
      */
     public function log($level, $message, array $context = [])
     {
@@ -84,6 +91,8 @@ public function log($level, $message, array $context = [])
             ->getMessage();
 
         $this->storage->store($newMessage, $level);
+        $this->lastMessage = $this->message;
+        $this->reloadMessage();
     }
 
     /**
@@ -147,6 +156,6 @@ public function getOption($key = null)
      */
     public function getLastMessage()
     {
-        return $this->message->getMessage();
+        return $this->lastMessage->getMessage();
     }
 }
diff --git a/src/Storage/File.php b/src/Storage/File.php
@@ -31,7 +31,7 @@ public function store($message, $level)
         $logFile = $this->params['log_path'] . DIRECTORY_SEPARATOR . $level . '.log';
 
         if (!file_exists($this->params['log_path'])) {
-            $bool = mkdir($this->params['log_path']);
+            $bool = @mkdir($this->params['log_path']);
 
             if (!$bool) {
                 throw new LogException('Unable to create log directory: ' . $this->params['log_path']);
@@ -42,7 +42,7 @@ public function store($message, $level)
             $flag = FILE_APPEND;
         }
 
-        $bool = file_put_contents($logFile, $message, $flag);
+        $bool = @file_put_contents($logFile, $message, $flag | LOCK_EX);
 
         if (!$bool) {
             throw new LogException('Unable to save log file: ' . $logFile);

diff --git a/tests/SimpleLogTest.php b/tests/SimpleLogTest.php
@@ -76,6 +76,29 @@ public function testCreateSimpleLogMessage()
         //because of different time and date of creating log file, we remove first line with date
         $this->assertEquals($this->getSampleContent(), substr($content, strpos($content, "\n") +1));
     }
+
+    /**
+     * simple create log object and create log message in given directory
+     */
+    public function testCreateMultipleSimpleLogMessage()
+    {
+        $log = new Log(['log_path' => $this->logPath]);
+
+        $this->assertFileNotExists($this->logPath . self::NOTICE_LOG_NAME);
+
+        $log->makeLog('Some log message');
+
+        $this->assertFileExists($this->logPath . self::NOTICE_LOG_NAME);
+
+        $log->makeLog('Some log message');
+
+        $content = file_get_contents($this->logPath . self::NOTICE_LOG_NAME);
+        //because of different time and date of creating log file, we remove first line with date
+        $this->assertEquals(
+            $this->getSampleContent() . $this->getSampleContent(),
+            preg_replace('#[\d]{4}-[\d]{2}-[\d]{2} - [\d]{2}:[\d]{2}:[\d]{2}\n#', '', $content)
+        );
+    }
 
     public function testCreateSimpleLogWithOtherStorage()
     {