Add graceful max execution timeout.

Apply requested changes.

Author: d-ph

DependencyInjection/Configuration.php

@@ -138,8 +138,13 @@ protected function addConsumers(ArrayNodeDefinition $node)
                             ->scalarNode('callback')->isRequired()->end()
                             ->scalarNode('idle_timeout')->end()
                             ->scalarNode('idle_timeout_exit_code')->end()
-                            ->scalarNode('graceful_max_execution_timeout')->end()
-                            ->scalarNode('graceful_max_execution_timeout_exit_code')->end()
+                            ->arrayNode('graceful_max_execution')
+                                ->canBeUnset()
+                                ->children()
+                                    ->integerNode('timeout')->end()
+                                    ->integerNode('exit_code')->defaultValue(0)->end()
+                                ->end()
+                            ->end()
                             ->scalarNode('auto_setup_fabric')->defaultTrue()->end()
                             ->arrayNode('qos_options')
                                 ->canBeUnset()

DependencyInjection/OldSoundRabbitMqExtension.php

@@ -200,16 +200,14 @@ protected function loadConsumers()
             if (isset($consumer['idle_timeout_exit_code'])) {
                 $definition->addMethodCall('setIdleTimeoutExitCode', array($consumer['idle_timeout_exit_code']));
             }
-            if (isset($consumer['graceful_max_execution_timeout'])) {
+            if (isset($consumer['graceful_max_execution'])) {
                 $definition->addMethodCall(
                     'setGracefulMaxExecutionDateTimeFromSecondsInTheFuture',
-                    array($consumer['graceful_max_execution_timeout'])
+                    array($consumer['graceful_max_execution']['timeout'])
                 );
-            }
-            if (isset($consumer['graceful_max_execution_timeout_exit_code'])) {
                 $definition->addMethodCall(
                     'setGracefulMaxExecutionTimeoutExitCode',
-                    array($consumer['graceful_max_execution_timeout_exit_code'])
+                    array($consumer['graceful_max_execution']['exit_code'])
                 );
             }
             if (!$consumer['auto_setup_fabric']) {

README.md

@@ -395,9 +395,9 @@ consumers:
 
 #### Graceful max execution timeout ####
 
-If you'd like your consumer to be running up to certain time and then gracefully exit, then set the `graceful_max_execution_timeout` in seconds.
+If you'd like your consumer to be running up to certain time and then gracefully exit, then set the `graceful_max_execution.timeout` in seconds.
 "Gracefully exit" means, that the consumer will exit either after the currently running task or immediatelly, when waiting for new tasks.
-The `graceful_max_execution_timeout_exit_code` specifies what exit code should be returned by the consumer when the graceful max execution timeout occurs. Without specifying it, the consumer will exit with status `0`.
+The `graceful_max_execution.exit_code` specifies what exit code should be returned by the consumer when the graceful max execution timeout occurs. Without specifying it, the consumer will exit with status `0`.
 
 This feature is great in conjuction with supervisord, which together can allow for periodical memory leaks cleanup, connection with database/rabbitmq renewal and more.
 
@@ -408,12 +408,10 @@ consumers:
         exchange_options:       {name: 'upload-picture', type: direct}
         queue_options:          {name: 'upload-picture'}
         callback:               upload_picture_service
-        
-        # 30 minutes
-        graceful_max_execution_timeout: 1800
-         
-        # default is 0
-        graceful_max_execution_timeout_exit_code: 10 
+
+        graceful_max_execution:
+            timeout: 1800 # 30 minutes 
+            exit_code: 10 # default is 0 
 ```
 
 #### Fair dispatching ####

RabbitMq/Consumer.php

@@ -77,15 +77,15 @@ public function consume($msgAmount)
                 $waitTimeout['timeoutType'] === self::TIMEOUT_TYPE_GRACEFUL_MAX_EXECUTION
                 && $waitTimeout['seconds'] < 1
             ) {
-                return $this->getGracefulMaxExecutionTimeoutExitCode();
+                return $this->gracefulMaxExecutionTimeoutExitCode;
             }
 
             if (!$this->forceStop) {
                 try {
                     $this->getChannel()->wait(null, false, $waitTimeout['seconds']);
                 } catch (AMQPTimeoutException $e) {
                     if (self::TIMEOUT_TYPE_GRACEFUL_MAX_EXECUTION === $waitTimeout['timeoutType']) {
-                        return $this->getGracefulMaxExecutionTimeoutExitCode();
+                        return $this->gracefulMaxExecutionTimeoutExitCode;
                     }
 
                     $idleEvent = new OnIdleEvent($this);
@@ -214,7 +214,7 @@ protected function isRamAlmostOverloaded()
     /**
      * @param \DateTime|null $dateTime
      */
-    public function setGracefulMaxExecutionDateTime($dateTime = null)
+    public function setGracefulMaxExecutionDateTime(\DateTime $dateTime = null)
     {
         $this->gracefulMaxExecutionDateTime = $dateTime;
     }

Tests/RabbitMq/ConsumerTest.php

@@ -285,7 +285,7 @@ public function testGracefulMaxExecutionTimeoutExitCode()
             ->method('wait')
             ->willThrowException(new AMQPTimeoutException());
 
-        $this->assertTrue(10 == $consumer->consume(1));
+        $this->assertSame(10, $consumer->consume(1));
     }
 
     public function testGracefulMaxExecutionWontWaitIfPastTheTimeout()