valitydev/yandex-tank
14
0
Fork 0
mirror of https://github.com/valitydev/yandex-tank.git synced 2024-11-06 02:15:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

typos

Browse Source
This commit is contained in:
Alexey Lavrenuke 2015-02-05 15:00:46 +03:00
parent 0d4b53d21b
commit d5ac78b2d7
5 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
setup.py
View File

@ -53,7 +53,28 @@ analytic tools for the results they produce.
# TODO: move them all to resources maybe
data_files=[
('/etc/yandex-tank', [
'config/*',
'config/00-base.ini',
]),
('/etc/yandex-tank/JMeter', [
'config/JMeter/jmeter_argentum.xml',
'config/JMeter/jmeter_var_template.xml',
'config/JMeter/jmeter_writer.xml',
]),
('/etc/yandex-tank/GraphiteUploader', [
'config/GraphiteUploader/graphite-js.tpl',
'config/GraphiteUploader/graphite.tpl',
]),
('/etc/yandex-tank/Monitoring', [
'config/Monitoring/agent.cfg',
'config/Monitoring/monitoring_default_config.xml',
]),
('/etc/yandex-tank/Phantom', [
'config/Phantom/phantom.conf.tpl',
'config/Phantom/phantom_benchmark_additional.tpl',
'config/Phantom/phantom_benchmark_main.tpl',
]),
('/etc/yandex-tank/TipsAndTricks', [
'config/TipsAndTricks/tips.txt',
]),
]
)

4
yandextank/plugins/GraphiteUploader.py
View File

@ -43,9 +43,9 @@ class GraphiteUploaderPlugin(AbstractPlugin, AggregateResultListener):
port = self.get_option("port", "2003")
self.web_port = self.get_option("web_port", "8080")
self.prefix = self.get_option("prefix", "one_sec.yandex_tank")
default_template = "/etc/yandextank/GraphiteUploader/graphite.tpl"
default_template = "/etc/yandex-tank/GraphiteUploader/graphite.tpl"
if self.get_option("js", "1") == "1":
default_template = "/etc/yandextank/GraphiteUploader/graphite-js.tpl"
default_template = "/etc/yandex-tank/GraphiteUploader/graphite-js.tpl"
self.template = self.get_option("template", default_template)
self.graphite_client = GraphiteClient(self.prefix, self.address, port)
aggregator = self.core.get_plugin_of_type(AggregatorPlugin)

6
yandextank/plugins/JMeter.py
View File

@ -123,16 +123,16 @@ class JMeterPlugin(AbstractPlugin):
except Exception, exc:
raise RuntimeError("Failed to find the end of JMX XML: %s" % exc)
tpl_filepath = '/etc/yandextank/JMeter/jmeter_writer.xml'
tpl_filepath = '/etc/yandex-tank/JMeter/jmeter_writer.xml'
if self.use_argentum:
self.log.warn("You are using argentum aggregator for JMeter. Be careful.")
tpl_filepath = '/etc/yandextank/JMeter/jmeter_argentum.xml'
tpl_filepath = '/etc/yandex-tank/JMeter/jmeter_argentum.xml'
with open(tpl_filepath, 'r') as tpl_file:
tpl = tpl_file.read()
with open('/etc/yandextank/JMeter/jmeter_var_template.xml', 'r') as tpl_file:
with open('/etc/yandex-tank/JMeter/jmeter_var_template.xml', 'r') as tpl_file:
udv_tpl = tpl_file.read()
udv_set = []

4
yandextank/plugins/PhantomUtils.py
View File

@ -103,7 +103,7 @@ class PhantomConfig:
filename = self.core.mkstemp(".conf", "phantom_")
self.core.add_artifact_file(filename)
self.log.debug("Generating phantom config: %s", filename)
tpl_file = open("/etc/yandextank/Phantom/phantom.conf.tpl", 'r')
tpl_file = open("/etc/yandex-tank/Phantom/phantom.conf.tpl", 'r')
template_str = tpl_file.read()
tpl_file.close()
tpl = string.Template(template_str)
@ -310,7 +310,7 @@ class StreamConfig:
fname = 'phantom_benchmark_main.tpl'
else:
fname = 'phantom_benchmark_additional.tpl'
tplf = open('/etc/yandextank/Phantom/' + fname, 'r')
tplf = open('/etc/yandex-tank/Phantom/' + fname, 'r')
template_str = tplf.read()
tplf.close()
tpl = string.Template(template_str)

2
yandextank/plugins/TipsAndTricks.py
View File

@ -17,7 +17,7 @@ class TipsAndTricksPlugin(AbstractPlugin, AbstractInfoWidget):
def __init__(self, core):
AbstractPlugin.__init__(self, core)
AbstractInfoWidget.__init__(self)
lines = open('/etc/yandextank/TipsAndTricks/tips.txt').readlines()
lines = open('/etc/yandex-tank/TipsAndTricks/tips.txt').readlines()
line = random.choice(lines)
self.section = line[:line.index(':')]
self.tip = line[line.index(':') + 1:].strip()