Skip to content

[WIP] Multiple queues #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Nyholm wants to merge 2 commits into
base: master
Choose a base branch
from
Open

[WIP] Multiple queues #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
985d8b1
fixed the configuration
Nyholm Aug 4, 2014
6ea07da
Adding comments and fixes
Nyholm Aug 4, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions DependencyInjection/CompilerPass/ListenerPass.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ class ListenerPass implements CompilerPassInterface
{
public function process(ContainerBuilder $container)
{
if (!$container->hasDefinition('fervo_deferred_event.dispatcher'))
{
if (!$container->hasDefinition('fervo_deferred_event.dispatcher')) {
return;
}

Expand All @@ -21,7 +20,7 @@ public function process(ContainerBuilder $container)
$listenerTags = $container->findTaggedServiceIds('fervo_deferred_event.listener');
foreach ($listenerTags as $id => $tags) {
foreach ($tags as $tag) {
$deferredEvents[] = $tag['event'];
$deferredEvents[] = array($tag['event'], isset($tag['backend']) ? $tag['backend'] : 'default');

$callArgs = [
$tag['event'],
Expand All @@ -32,6 +31,8 @@ public function process(ContainerBuilder $container)
$callArgs[] = $tag['priority'];
}

$callArgs[] = isset($tag['backend']) ? $tag['backend'] : 'default';

$fervoDispatcherDef->addMethodCall('addListener', $callArgs);
}
}
Expand All @@ -43,9 +44,12 @@ public function process(ContainerBuilder $container)

$deferredEvents = array_unique($deferredEvents);

// Comment

foreach ($deferredEvents as $event) {
$sfDispatcherDef->addMethodCall(
'addListenerService', [
'addListenerService',
[
$event,
['fervo_deferred_event.listener', 'onNonDeferEvent'],
-127,
Expand Down
97 changes: 70 additions & 27 deletions DependencyInjection/Configuration.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,39 +13,82 @@ public function getConfigTreeBuilder()
$rootNode = $treeBuilder->root('fervo_dispatch');

$rootNode
->beforeNormalization()
->ifTrue(function ($v) { return is_array($v) && !array_key_exists('backends', $v); })
->then(function ($v) {
$backend = array();

if (!isset($v['backend'])) {
//if not 'backend' or 'backends' are configured
$backend = array('type' => 'immediate');
} else {
foreach ($v['backend'] as $key => $value) {
$backend[$key] = $v['backend'][$key];
unset($v['backend'][$key]);
}
}

$v['default_backend'] = isset($v['default_backend']) ? (string) $v['default_backend'] : 'default';
$v['backends'] = array($v['default_backend'] => $backend);

unset($v['backend']);

return $v;
})

->end()
->validate()
->ifTrue(function($v) { return !array_key_exists($v['default_backend'], $v['backends']); })
->thenInvalid('The configuration "default_backend" must be referring to the name of one of your backends.')
->end()
->children()
->arrayNode('backend')->addDefaultsIfNotSet()
->children()
->enumNode('type')
->values(array('sidekiq', 'immediate', 'amqp'))
->defaultValue('immediate')
->end()
->scalarNode('sidekiq_client_service')->end()
->arrayNode('amqp_config')->addDefaultsIfNotSet()
->children()
->scalarNode('host')->defaultValue('localhost')->end()
->integerNode('port')->defaultValue(5672)->end()
->scalarNode('user')->defaultValue('guest')->end()
->scalarNode('pass')->defaultValue('guest')->end()
->scalarNode('vhost')->defaultValue('/')->end()
->end()
->end()
->arrayNode('message_headers')->addDefaultsIfNotSet()
->children()
->scalarNode('php_bin')->defaultNull()->end()
->scalarNode('console_path')->defaultNull()->end()
->scalarNode('dispatch_path')->defaultNull()->end()
->scalarNode('fastcgi_host')->cannotBeEmpty()->defaultValue('localhost')->end()
->integerNode('fastcgi_port')->cannotBeEmpty()->defaultValue(9000)->end()
->end()
->end()
->end()
->end()
->scalarNode('default_backend')->cannotBeEmpty()->defaultValue('default')->end()
->append($this->getBackendsNode())
->scalarNode('serializer')->defaultValue('fervo_deferred_event.serializer.base64')->end()
->scalarNode('serializer_format')->defaultValue('base64')->end()
->end()
;

return $treeBuilder;
}


private function getBackendsNode()
{
$treeBuilder = new TreeBuilder();
$node = $treeBuilder->root('backends');

$node
->requiresAtLeastOneElement()
->useAttributeAsKey('name')
->prototype('array')
->children()
->enumNode('type')
->values(array('sidekiq', 'immediate', 'amqp'))
->defaultValue('immediate')
->end()
->scalarNode('sidekiq_client_service')->end()
->arrayNode('amqp_config')->addDefaultsIfNotSet()
->children()
->scalarNode('host')->defaultValue('localhost')->end()
->integerNode('port')->defaultValue(5672)->end()
->scalarNode('user')->defaultValue('guest')->end()
->scalarNode('pass')->defaultValue('guest')->end()
->scalarNode('vhost')->defaultValue('/')->end()
->end()
->end()
->arrayNode('message_headers')->addDefaultsIfNotSet()
->children()
->scalarNode('php_bin')->defaultNull()->end()
->scalarNode('console_path')->defaultNull()->end()
->scalarNode('dispatch_path')->defaultNull()->end()
->scalarNode('fastcgi_host')->cannotBeEmpty()->defaultValue('localhost')->end()
->integerNode('fastcgi_port')->cannotBeEmpty()->defaultValue(9000)->end()
->end()
->end()
->end()
;

return $node;
}
}
27 changes: 15 additions & 12 deletions DependencyInjection/FervoDeferredEventExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,25 +28,28 @@ public function load(array $configs, ContainerBuilder $container)

$container->setAlias('fervo_deferred_event.serializer', $config['serializer']);

if (!empty($config['backend']['sidekiq_client_service'])) {
$def = $container->getDefinition('fervo_deferred_event.queue.sidekiq');
$def->replaceArgument(0, new Reference($config['backend']['sidekiq_client_service']));
}
foreach ($config['backends'] as $backend) {
if (!empty($backend['sidekiq_client_service'])) {
$def = $container->getDefinition('fervo_deferred_event.queue.sidekiq');
$def->replaceArgument(0, new Reference($backend['sidekiq_client_service']));
}

if ($config['backend']['type']=='amqp') {
$def = $container->getDefinition('fervo_deferred_event.queue.amqp');
$def->replaceArgument(0, $config['backend']['amqp_config']);
}
if ($backend['type']=='amqp') {
$def = $container->getDefinition('fervo_deferred_event.queue.amqp');
$def->replaceArgument(0, $backend['amqp_config']);
}

// add message headers to the message service
$def = $container->getDefinition('fervo_deferred_event.service.message_service');
$def->replaceArgument(0, $config['backend']['message_headers']);

// add message headers to the message service
$def = $container->getDefinition('fervo_deferred_event.service.message_service');
$def->replaceArgument(0, $backend['message_headers']);
}

$container->setParameter('fervo_deferred_event.serializer_format', $config['serializer_format']);

$container->setAlias(
'fervo_deferred_event.queue',
sprintf('fervo_deferred_event.queue.%s', $config['backend']['type'])
sprintf('fervo_deferred_event.queue.%s', $config['backends']['default']['type'])
);
}
}