Skip to content

Commit 821ebbf

Browse files
author
Maxim Solovev
committed
Throttle plugin small fixes
1 parent 5380dad commit 821ebbf

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

src/DependencyInjection/Configuration.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -629,10 +629,10 @@ private function addSharedPluginNodes(ArrayNodeDefinition $pluginNode, $disableA
629629
->canBeEnabled()
630630
->addDefaultsIfNotSet()
631631
->children()
632-
->scalarNode('name')->end()
633-
->scalarNode('key')->defaultNull()->end()
634-
->integerNode('tokens')->defaultValue(1)->end()
635-
->floatNode('max_time')->defaultNull()->end()
632+
->scalarNode('name')->isRequired()->info('Rate limiter configuration name from rate_limiter.yaml')->end()
633+
->scalarNode('key')->defaultNull()->info('A unique key for using one rate limiter name for different clients')->end()
634+
->integerNode('tokens')->defaultValue(1)->info('How many tokens spending per request')->end()
635+
->floatNode('max_time')->defaultNull()->info('Maximum accepted waiting time in seconds')->end()
636636
->end()
637637
->end();
638638
// End throttle plugin

src/DependencyInjection/HttplugExtension.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -299,14 +299,14 @@ private function configurePluginByName($name, Definition $definition, array $con
299299
throw new InvalidConfigurationException('You need to require the Throttle Plugin to be able to use it: "composer require php-http/throttle-plugin".');
300300
}
301301

302-
$key = $config['name'] ? '.'.$config['name'] : '';
302+
$limiterServiceId = $serviceId.'.'.$config['name'];
303303
$container
304-
->register($serviceId.$key, LimiterInterface::class)
304+
->register($limiterServiceId, LimiterInterface::class)
305305
->setFactory([new Reference('limiter.'.$config['name']), 'create'])
306306
->addArgument($config['key'])
307307
->setPublic(false);
308308

309-
$definition->replaceArgument(0, new Reference($serviceId.$key));
309+
$definition->replaceArgument(0, new Reference($limiterServiceId));
310310
$definition->setArgument('$tokens', $config['tokens']);
311311
$definition->setArgument('$maxTime', $config['max_time']);
312312

0 commit comments

Comments
 (0)