Merge pull request #14 from cesargb/scheduler

update register schedule
cesargb · Oct 10, 2021 · 4a4683f · 4a4683f
2 parents a17b9fb + fa9ffae
commit 4a4683f
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 16 deletions.
diff --git a/composer.json b/composer.json
@@ -19,14 +19,14 @@
     "license": "MIT",
     "require": {
         "php" : "^7.2 | ^8.0",
-        "illuminate/config": "^6.0|^7.0|^8.0",
-        "illuminate/console": "^6.0|^7.0|^8.0",
-        "illuminate/log": "^6.0|^7.0|^8.0",
-        "illuminate/support": "^6.0|^7.0|^8.0",
+        "illuminate/config": "^6.10|^7.0|^8.0",
+        "illuminate/console": "^6.10|^7.0|^8.0",
+        "illuminate/log": "^6.10|^7.0|^8.0",
+        "illuminate/support": "^6.10|^7.0|^8.0",
         "monolog/monolog": "^2.0"
     },
     "require-dev": {
-        "orchestra/testbench": "^4.0|^5.0|^6.0",
+        "orchestra/testbench": "^4.10|^5.0|^6.0",
         "phpunit/phpunit": "^7.0|^8.0|^9.0"
     },
     "autoload": {

diff --git a/src/RotateServiceProvider.php b/src/RotateServiceProvider.php
@@ -23,18 +23,9 @@ public function boot()
                 Commands\Rotate::class,
                 Commands\RotateFile::class,
             ]);
-        }
-
-        $this->app->booted(function () {
-            if (config('rotate.schedule.enable', true)) {
-                $schedule = $this->app->make(Schedule::class);
-
-                $cronOldVersion = config('rotate.logs_rotate_schedule', '0 0 * * *');
-                $cron = config('rotate.schedule.cron', $cronOldVersion);
 
-                $schedule->command('rotate:logs')->cron($cron);
-            }
-        });
+            $this->registerSchedule();
+        }
     }
 
     /**
@@ -46,4 +37,18 @@ public function register()
     {
         $this->mergeConfigFrom(__DIR__.'/../config/rotate.php', 'rotate');
     }
+
+    private function registerSchedule()
+    {
+        if (! config('rotate.schedule.enable', true)) {
+            return;
+        }
+
+        $this->callAfterResolving(Schedule::class, function (Schedule $schedule) {
+            $cronOldVersion = config('rotate.logs_rotate_schedule', '0 0 * * *');
+            $cron = config('rotate.schedule.cron', $cronOldVersion);
+
+            $schedule->command('rotate:logs')->cron($cron);
+        });
+    }
 }