Merge pull request #3 from fieg/default-ttr

Added default ttr configuration
treehouselabs · Oct 28, 2015 · 0c09b34 · 0c09b34
2 parents b8f97d9 + 7e7198e
commit 0c09b34
Show file tree

Hide file tree

Showing 4 changed files with 87 additions and 1 deletion.
diff --git a/src/TreeHouse/WorkerBundle/DependencyInjection/Configuration.php b/src/TreeHouse/WorkerBundle/DependencyInjection/Configuration.php
@@ -20,6 +20,7 @@ public function getConfigTreeBuilder()
             ->info('The id of a pheanstalk service. The service must implement Pheanstalk\\PheanstalkInterface')
         ;
 
+        // beanstalk settings
         $queue = $rootNode->arrayNode('queue')->children();
         $queue
             ->scalarNode('server')
@@ -42,6 +43,22 @@ public function getConfigTreeBuilder()
             ->info('Connection timeout')
         ;
 
+        // queue manager settings
+
+        $qm = $rootNode->arrayNode('queue_manager');
+        $qm
+            ->addDefaultsIfNotSet()
+            ->children()
+                ->scalarNode('default_ttr')
+                    ->cannotBeEmpty()
+                    ->defaultValue(1200)
+                    ->isRequired()
+                    ->info('Default time-to-run for a job')
+                ->end()
+            ->end()
+        ;
+
+
         return $treeBuilder;
     }
 }
diff --git a/src/TreeHouse/WorkerBundle/DependencyInjection/TreeHouseWorkerExtension.php b/src/TreeHouse/WorkerBundle/DependencyInjection/TreeHouseWorkerExtension.php
@@ -56,5 +56,8 @@ public function configurePheanstalk(array $config, ContainerBuilder $container)
 
         $pheanstalk = new Definition(Pheanstalk::class, $pheanstalkConfig);
         $queueManager->replaceArgument(0, $pheanstalk);
+
+        // set default ttr
+        $queueManager->addMethodCall('setDefaultTtr', [$config['queue_manager']['default_ttr']]);
     }
 }
diff --git a/src/TreeHouse/WorkerBundle/QueueManager.php b/src/TreeHouse/WorkerBundle/QueueManager.php
@@ -61,6 +61,11 @@ class QueueManager
      */
     protected $resolvers = [];
 
+    /**
+     * @var int
+     */
+    protected $defaultTtr = PheanstalkInterface::DEFAULT_TTR;
+
     /**
      * @param PheanstalkInterface      $pheanstalk
      * @param EventDispatcherInterface $dispatcher
@@ -73,6 +78,18 @@ public function __construct(PheanstalkInterface $pheanstalk, EventDispatcherInte
         $this->logger     = $logger ?: new NullLogger();
     }
 
+    /**
+     * @param int $defaultTtr
+     *
+     * @return $this
+     */
+    public function setDefaultTtr($defaultTtr)
+    {
+        $this->defaultTtr = $defaultTtr;
+
+        return $this;
+    }
+
     /**
      * @return PheanstalkInterface
      */
@@ -203,7 +220,7 @@ public function add($action, array $payload, $delay = null, $priority = null, $t
         }
 
         if (null === $ttr) {
-            $ttr = PheanstalkInterface::DEFAULT_TTR;
+            $ttr = $this->defaultTtr;
         }
 
         if (!is_numeric($delay)) {

diff --git a/tests/TreeHouse/WorkerBundle/Tests/DependencyInjection/TreeHouseWorkerExtensionTest.php b/tests/TreeHouse/WorkerBundle/Tests/DependencyInjection/TreeHouseWorkerExtensionTest.php
@@ -118,4 +118,53 @@ public function getInvalidConfigurations()
             ],
         ];
     }
+
+    public function testDefaultTtr()
+    {
+        $config = [
+            'tree_house.worker' => [
+                'queue' => [
+                    'server'  => 'localhost',
+                    'port'    => 1234,
+                    'timeout' => 60,
+                ],
+                'queue_manager' => [
+                    'default_ttr'  => 600,
+                ],
+            ],
+        ];
+
+        $this->extension->load($config, $this->container);
+        $this->container->compile();
+
+        $this->assertTrue($this->container->hasDefinition('tree_house.worker.queue_manager'));
+
+        $definition = $this->container->getDefinition('tree_house.worker.queue_manager');
+        $methodCalls = $definition->getMethodCalls();
+
+        $this->assertContains(['setDefaultTtr', [600]], $methodCalls);
+    }
+
+    public function testDefaultDefaultTtrIs1200()
+    {
+        $config = [
+            'tree_house.worker' => [
+                'queue' => [
+                    'server'  => 'localhost',
+                    'port'    => 1234,
+                    'timeout' => 60,
+                ]
+            ],
+        ];
+
+        $this->extension->load($config, $this->container);
+        $this->container->compile();
+
+        $this->assertTrue($this->container->hasDefinition('tree_house.worker.queue_manager'));
+
+        $definition = $this->container->getDefinition('tree_house.worker.queue_manager');
+        $methodCalls = $definition->getMethodCalls();
+
+        $this->assertContains(['setDefaultTtr', [1200]], $methodCalls);
+    }
 }