Merge pull request #21 from win32service/revert-20-issue_17_failed_message_never_retried

Revert "issue #17 add code to retry and PHPUnit for tests"

lib/DependencyInjection/Configuration.php

@@ -113,9 +113,9 @@ class Configuration implements ConfigurationInterface
                             ->integerNode('thread_count')->defaultValue(1)->min(1)->end()
                             ->booleanNode('delayed_start')->defaultFalse()->end()
                             ->integerNode('limit')->defaultValue(0)->min(0)->end()
-                            ->integerNode('failure-limit')->defaultValue(0)->min(0)->end()
-                            ->integerNode('time-limit')->defaultValue(0)->min(0)->end()
-                            ->scalarNode('memory-limit')->defaultValue('')->end()
+                            ->integerNode('failure_limit')->defaultValue(0)->min(0)->end()
+                            ->integerNode('time_limit')->defaultValue(0)->min(0)->end()
+                            ->scalarNode('memory_limit')->defaultValue('')->end()
                         ->end()
                     ->end()
                 ->end()

lib/Model/MessengerServiceRunner.php

@@ -52,7 +52,7 @@ final class MessengerServiceRunner extends AbstractServiceRunner
         private ?LoggerInterface $logger = null,
         private array $receiverNames = [],
         private ?ResetServicesListener $resetServicesListener = null,
-        private array $busIds = []
+        private array $busIds = [],
     ) {
         $this->unacks = new \SplObjectStorage();
     }
@@ -66,15 +66,15 @@ final class MessengerServiceRunner extends AbstractServiceRunner
         if ($limit > 0) {
             $this->eventDispatcher->addSubscriber(new StopWorkerOnMessageLimitListener($limit, $this->logger));
         }
-        $failureLimit = (int) $this->config['failure-limit'];
+        $failureLimit = (int) $this->config['failure_limit'];
         if ($failureLimit > 0) {
             $this->eventDispatcher->addSubscriber(new StopWorkerOnFailureLimitListener($failureLimit, $this->logger));
         }
-        $timeLimit = (int) $this->config['time-limit'];
+        $timeLimit = (int) $this->config['time_limit'];
         if ($timeLimit > 0) {
             $this->eventDispatcher->addSubscriber(new StopWorkerOnTimeLimitListener($timeLimit, $this->logger));
         }
-        $memoryLimit = (string) $this->config['memory-limit'];
+        $memoryLimit = (string) $this->config['memory_limit'];
         if ($memoryLimit > 0) {
             $this->eventDispatcher->addSubscriber(new StopWorkerOnMemoryLimitListener(
                 $this->convertToBytes($memoryLimit),
@@ -85,9 +85,9 @@ final class MessengerServiceRunner extends AbstractServiceRunner
         $this->receivers = [];
         foreach ($this->config['receivers'] as $receiverName) {
             if (!$this->receiverLocator->has($receiverName)) {
-                $message = sprintf('The receiver "%s" does not exist.', $receiverName);
+                $message = \sprintf('The receiver "%s" does not exist.', $receiverName);
                 if ($this->receiverNames) {
-                    $message .= sprintf(' Valid receivers are: %s.', implode(', ', $this->receiverNames));
+                    $message .= \sprintf(' Valid receivers are: %s.', implode(', ', $this->receiverNames));
                 }
 
                 throw new RuntimeException($message);
@@ -105,7 +105,6 @@ final class MessengerServiceRunner extends AbstractServiceRunner
 
         $this->shouldStop = true;
         $this->requestStop();
-        throw new \RuntimeException('Stop requested');
     }
 
     protected function beforeContinue(): void

tests/Application/config/packages/win32service.yaml

@@ -6,4 +6,5 @@ win32_service:
       limit: 10
       displayed_name: Demo Messenger Consumer Async %d
       thread_count: 2
+      memory_limit: 3600