Merge pull request #20 from cesargb/fix-issue-8

fix issue #8
cesargb · Dec 27, 2021 · c1cb47a · c1cb47a
2 parents c22522b + e9091a5
commit c1cb47a
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 326 deletions.
diff --git a/README.md b/README.md
@@ -114,24 +114,24 @@ Every time a file is rotated one of these events occurs:
 
 ### RotateWasSuccessful
 
-`Cesargb\File\Rotate\Events\RotateWasSuccessful`
+`Cesargb\LaravelLog\Events\RotateWasSuccessful`
 
 This event will be fired when rotated was successful.
 
 It has two public properties:
 
-* fileSource: the full path of file to rotate
-* fileRotated: the full path of file rotated
+* filename: the full path of file to rotate
+* filenameTarget: the full path of file rotated
 
 ### RotateHasFailed
 
-`Cesargb\File\Rotate\Handlers\RotativeHandler`
+`Cesargb\LaravelLog\Events\RotativeHandler`
 
 This event will be fired when an error occurs while rotated
 
 It has two public properties:
 
-* fileSource: the full path of file to rotate
+* filename: the full path of file to rotate
 * exception: an object that extends PHP's Exception class.
 
 ## About
@@ -150,10 +150,6 @@ composer test
 
 Please see [UPGRADING](UPGRADING.md) for details.
 
-## Knowledge Issues
-
-* [#8](https://github.com/cesargb/laravel-logs-rotate/issues/8) While the file is being rotated, any record of another process may be lost.
-
 ## Contributing
 
 Any contributions are welcome.

diff --git a/composer.json b/composer.json
@@ -24,7 +24,7 @@
         "illuminate/log": "^6.20|^8.0",
         "illuminate/support": "^6.20|^8.0",
         "monolog/monolog": "^2.0",
-        "cesargb/php-log-rotation": "^2.3"
+        "cesargb/php-log-rotation": "^2.4"
     },
     "require-dev": {
         "orchestra/testbench": "^4.18|^6.20",

diff --git a/src/Handlers/AbstractHandler.php b/src/Handlers/AbstractHandler.php
diff --git a/src/Handlers/HandlerInterface.php b/src/Handlers/HandlerInterface.php
diff --git a/src/Handlers/RotativeHandler.php b/src/Handlers/RotativeHandler.php
diff --git a/src/Rotate.php b/src/Rotate.php
@@ -4,6 +4,7 @@
 
 use Cesargb\LaravelLog\Events\RotateHasFailed;
 use Cesargb\LaravelLog\Events\RotateWasSuccessful;
+use Cesargb\LaravelLog\Helpers\Log;
 use Cesargb\Log\Rotation;
 
 class Rotate
@@ -17,7 +18,13 @@ public function files(array $filenames)
 
     public function file(string $filename, array $options = []): bool
     {
-        return $this->buildRotateDefault($options)->rotate($filename);
+        $result = $this->buildRotateDefault($options)->rotate($filename);
+
+        if ($result) {
+            Log::closeHandlers();
+        }
+
+        return $result;
     }
 
     private function buildRotateDefault(array $options = []): Rotation

diff --git a/tests/Commands/RotateFileTest.php b/tests/Commands/RotateFileTest.php
@@ -30,56 +30,7 @@ public function itCanRotateFile()
         Event::assertDispatched(RotateWasSuccessful::class, 2);
 
         $this->assertEquals($resultCode, 0);
-        $this->assertEquals(filesize($file1), 0);
         $this->assertFileExists($file1.'.1.gz');
-        $this->assertEquals(filesize($file2), 0);
         $this->assertFileExists($file2.'.1.gz');
     }
-
-    // /** @test **/
-    // public function itCanRotateFileArchive()
-    // {
-    //     $file1 = $this->tmpDir.'/file1';
-    //     $file2 = $this->tmpDir.'/file2';
-
-    //     $resultCode = Artisan::call('rotate:files', [
-    //         '--file' => [$file1, $file2],
-    //         '--dir' => $this->tmpDir.'/archive',
-    //     ]);
-
-    //     Event::assertDispatched(RotateWasSuccessful::class, 2);
-
-    //     $this->assertEquals($resultCode, 0);
-    //     $this->assertEquals(filesize($file1), 0);
-    //     $this->assertFileExists(dirname($file1).'/archive/'.basename($file1).'.1.gz');
-    //     $this->assertEquals(filesize($file2), 0);
-    //     $this->assertFileExists(dirname($file2).'/archive/'.basename($file2).'.1.gz');
-    // }
-
-    // /** @test **/
-    // public function itCanRotateFileMax()
-    // {
-    //     $file = $this->tmpDir.'/file1';
-
-    //     for ($n = 0; $n < 5; ++$n) {
-    //         file_put_contents($file, 'test');
-
-    //         $resultCode = Artisan::call('rotate:files', [
-    //             '--file' => [$file],
-    //             '--max-files' => 3,
-    //         ]);
-
-    //         $this->assertEquals($resultCode, 0);
-    //     }
-
-    //     Event::assertDispatched(RotateWasSuccessful::class, 5);
-
-    //     $this->assertEquals(filesize($file), 0);
-
-    //     for ($n = 1; $n < 4; ++$n) {
-    //         $this->assertFileExists($file.'.'.$n.'.gz');
-    //     }
-
-    //     $this->assertFileNotExists($file.basename($file).'.4.gz');
-    // }
 }