Added ReactPHP EventLoop and standalone cron runner engine

vtsykun · Aug 18, 2023 · 72b84b7 · 72b84b7
1 parent 46fec47
commit 72b84b7
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 17 deletions.
diff --git a/src/Attribute/AsPeriodicalTask.php → src/Attribute/AsPeriodicTask.php b/src/Attribute/AsPeriodicalTask.php → src/Attribute/AsPeriodicTask.php
@@ -5,7 +5,7 @@
 namespace Okvpn\Bundle\CronBundle\Attribute;
 
 #[\Attribute(\Attribute::TARGET_CLASS)]
-class AsPeriodicalTask
+class AsPeriodicTask
 {
     public $interval;
     public $lock;
@@ -15,7 +15,7 @@ class AsPeriodicalTask
     public $jitter;
 
     public function __construct(
-        int $interval,
+        /*int|string */ $interval,
         bool $lock = null,
         bool $async = null,
         bool $messenger = null,

diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -27,6 +27,7 @@ public function getConfigTreeBuilder(): TreeBuilder
         // this will leave the search functionality and if you need to update the index, you can do it manually
         $rootNode->children()
             ->scalarNode('timezone')->defaultNull()->end()
+            ->scalarNode('loop_engine')->defaultNull()->end()
             ->arrayNode('messenger')
                 ->children()
                     ->booleanNode('enable')->defaultFalse()->end()
@@ -63,6 +64,7 @@ public function getConfigTreeBuilder(): TreeBuilder
                             ->end()
                         ->end()
                         ->integerNode('timeout')->end()
+                        ->scalarNode('interval')->end()
                     ->end()
                 ->end()
             ->end();

diff --git a/src/DependencyInjection/OkvpnCronExtension.php b/src/DependencyInjection/OkvpnCronExtension.php
@@ -5,12 +5,13 @@
 namespace Okvpn\Bundle\CronBundle\DependencyInjection;
 
 use Okvpn\Bundle\CronBundle\Attribute\AsCron;
-use Okvpn\Bundle\CronBundle\Attribute\AsPeriodicalTask;
+use Okvpn\Bundle\CronBundle\Attribute\AsPeriodicTask;
 use Okvpn\Bundle\CronBundle\CronServiceInterface;
 use Okvpn\Bundle\CronBundle\CronSubscriberInterface;
 use Okvpn\Bundle\CronBundle\Loader\ScheduleLoaderInterface;
 use Okvpn\Bundle\CronBundle\Middleware\MiddlewareEngineInterface;
 use Okvpn\Bundle\CronBundle\Model;
+use Okvpn\Bundle\CronBundle\Runner\ScheduleLoopInterface;
 use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\Config\FileLocator;
@@ -53,6 +54,8 @@ public function load(array $configs, ContainerBuilder $container): void
                 ->replaceArgument(0, new Reference($config['lock_factory']));
         }
 
+        $container->setAlias(ScheduleLoopInterface::class, $config['loop_engine'] ?? 'okvpn_cron.standalone_loop');
+
         $tasks = [];
         foreach (($config['tasks'] ?? []) as $task) {
             $task['shell'] = $task['shell'] ?? true;
@@ -93,7 +96,7 @@ public function load(array $configs, ContainerBuilder $container): void
                 $definition->addTag('okvpn.cron', $cron->getAttributes());
             });
 
-            $container->registerAttributeForAutoconfiguration(AsPeriodicalTask::class, static function (ChildDefinition $definition, AsPeriodicalTask $cron) {
+            $container->registerAttributeForAutoconfiguration(AsPeriodicTask::class, static function (ChildDefinition $definition, AsPeriodicTask $cron) {
                 $definition->addTag('okvpn.cron', $cron->getAttributes());
             });
         }

diff --git a/src/Resources/config/services.yml b/src/Resources/config/services.yml
@@ -27,7 +27,7 @@ services:
             - '@okvpn_cron.checker'
             - '%okvpn.config.cron_timezone%'
             - '@?clock'
-            - '@okvpn_cron.schedule_loop'
+            - '@Okvpn\Bundle\CronBundle\Runner\ScheduleLoopInterface'
             - '@Okvpn\Bundle\CronBundle\Runner\TimerStorage'
         tags:
             - { name: okvpn_cron.middleware, priority: 20 }
@@ -94,17 +94,18 @@ services:
 
     Okvpn\Bundle\CronBundle\Runner\TimerStorage: ~
 
-#    okvpn_cron.schedule_loop:
-#        class: Okvpn\Bundle\CronBundle\Runner\StandaloneLoop
-#        arguments:
-#            - '@?clock'
-#            - '%okvpn.config.cron_timezone%'
-#
-    okvpn_cron.schedule_loop:
-        alias: Okvpn\Bundle\CronBundle\React\ReactLoopAdapter
+    okvpn_cron.standalone_loop:
+        class: Okvpn\Bundle\CronBundle\Runner\StandaloneLoop
+        arguments:
+            - '@?clock'
+            - '%okvpn.config.cron_timezone%'
+
+    okvpn_cron.react_loop:
+        class: Okvpn\Bundle\CronBundle\React\ReactLoopAdapter
+        arguments: [~, '%okvpn.config.cron_timezone%']
 
     Okvpn\Bundle\CronBundle\Runner\ScheduleLoopInterface:
-        alias: okvpn_cron.schedule_loop
+        alias: okvpn_cron.standalone_loop
 
     Okvpn\Bundle\CronBundle\React\ReactLoopAdapter:
         arguments:
@@ -116,7 +117,7 @@ services:
             - '@okvpn_cron.runner_default'
             - '@okvpn_cron.loader_default'
             - '@?event_dispatcher'
-            - '@okvpn_cron.schedule_loop'
+            - '@Okvpn\Bundle\CronBundle\Runner\ScheduleLoopInterface'
             - '@?clock'
             - '%okvpn.config.cron_timezone%'
         tags:

diff --git a/src/Runner/TimerStorage.php b/src/Runner/TimerStorage.php
@@ -8,9 +8,9 @@
 use Okvpn\Bundle\CronBundle\Model\ScheduleEnvelope;
 
 /**
- * Storage all running timers for demand crond.
+ * Storage of all running timers for a crond demand.
  *
- * Simply access to schedule tasks
+ * Gives easy access to active scheduled tasks
  */
 class TimerStorage
 {