some tweaks

- makes scheduling more precise - allows a JobScheduler service to handle multiple commands
schmittjoh · Feb 29, 2016 · e7a1e4a · e7a1e4a
1 parent 0a0951d
commit e7a1e4a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/Command/ScheduleCommand.php b/Command/ScheduleCommand.php
@@ -23,7 +23,7 @@ protected function configure()
             ->setName('jms-job-queue:schedule')
             ->setDescription('Schedules jobs at defined intervals')
             ->addOption('max-runtime', null, InputOption::VALUE_REQUIRED, 'The maximum runtime of this command.', 3600)
-            ->addOption('min-job-interval', null, InputOption::VALUE_REQUIRED, 'The minimum time between schedules jobs in seconds.', 60)
+            ->addOption('min-job-interval', null, InputOption::VALUE_REQUIRED, 'The minimum time between schedules jobs in seconds.', 5)
         ;
     }
 
@@ -54,19 +54,20 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         $jobsLastRunAt = $this->populateJobsLastRunAt($registry->getManagerForClass(CronJob::class), $jobSchedulers);
 
-        $startedAt = $lastRunAt = time();
+        $startedAt = time();
         while (true) {
-            $lastRunAt = $now = time();
+            $lastRunAt = microtime(true);
+            $now = time();
             if ($now - $startedAt > $maxRuntime) {
                 $output->writeln('Max. runtime reached, exiting...');
                 break;
             }
 
             $this->scheduleJobs($output, $registry, $jobSchedulers, $jobsLastRunAt);
 
-            $timeToWait = time() - $lastRunAt + $minJobInterval;
+            $timeToWait = microtime(true) - $lastRunAt + $minJobInterval;
             if ($timeToWait > 0) {
-                sleep((integer)$timeToWait);
+                usleep($timeToWait * 1E6);
             }
         }
 

diff --git a/DependencyInjection/CompilerPass/JobSchedulersPass.php b/DependencyInjection/CompilerPass/JobSchedulersPass.php
@@ -12,11 +12,13 @@ public function process(ContainerBuilder $container)
     {
         $schedulers = array();
         foreach ($container->findTaggedServiceIds('jms_job_queue.scheduler') as $id => $attributes) {
-            if ( ! isset($attributes[0]['command'])) {
-                throw new \RuntimeException(sprintf('The tag "jms_job_queue.schedulers" of service "%s" must have a "command" attribute.', $id));
-            }
+            foreach ($attributes as $attributeData) {
+                if (!isset($attributeData['command'])) {
+                    throw new \RuntimeException(sprintf('The tag "jms_job_queue.schedulers" of service "%s" must have a "command" attribute.', $id));
+                }
 
-            $schedulers[$attributes[0]['command']] = new Reference($id);
+                $schedulers[$attributeData['command']] = new Reference($id);
+            }
         }
 
         $container->getDefinition('jms_job_queue.scheduler_registry')