Fixes serial fluctuation in the timing plot

vtsykun · Oct 6, 2018 · 32b8a11 · 32b8a11
1 parent de921e4
commit 32b8a11
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/src/Command/CronStatRetrieveCommand.php b/src/Command/CronStatRetrieveCommand.php
@@ -42,7 +42,15 @@ protected function configure()
     protected function execute(InputInterface $input, OutputInterface $output)
     {
         // For BC with Symfony 2.8
+        $maxAttempts = 10;
         $lock = new LockHandler('okvpn_mq_stat');
+        while ($maxAttempts--) {
+            if (true === $lock->lock()) {
+                break;
+            }
+            sleep(1);
+        }
+
         if (!$lock->lock()) {
             $output->writeln('Aborting, another of the same command is still active');
             return;
@@ -54,7 +62,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         sleep(5);
 
         try {
-            $lifetime = $input->getOption('lifetime') - 2 * QueuedMessagesProvider::POLLING_TIME;
+            $lifetime = $input->getOption('lifetime');
             $startTime = time();
             $delayPool = new DelayPool();
             $delayPool->setLogger(new ConsoleLogger($output));
@@ -70,7 +78,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 'processCount'
             );
 
-            while (time() - $startTime < $lifetime) {
+            while (time() - $startTime <= $lifetime) {
                 $delayPool->sync();
                 sleep(1);
             }