Skip to content

Commit

Permalink
Merge pull request #666 from nettorta/develop
Browse files Browse the repository at this point in the history
bugfix of default ammo provider files, FIXME added to pandora plugin
  • Loading branch information
fomars committed Nov 6, 2018
2 parents e126d83 + c672c18 commit 03055ca
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions yandextank/plugins/Pandora/plugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,10 +94,12 @@ def patch_config(self, config):
add result file section
:param dict config: pandora config
"""
# FIXME this is broken for custom ammo providers due to interface incompatibility
# FIXME refactor pandora plx
for pool in config['pools']:
if 'file' in pool.get('ammo', {}).get('source', {}).get('type', ''):
self.ammofile = pool['ammo']['source']['path']
pool['ammo']['source']['path'] = resource_manager.resource_filename(
if pool.get('ammo', {}).get('file', ''):
self.ammofile = pool['ammo']['file']
pool['ammo']['file'] = resource_manager.resource_filename(
self.ammofile
)
if not pool.get('result') or 'phout' not in pool.get('result', {}).get('type', ''):
Expand Down

0 comments on commit 03055ca

Please sign in to comment.