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

Fix monitoring config

Browse Source 
Allow monitoring config to contain XML body as well as file name.

Added test.
This commit is contained in:
Andrew Grigorev 2015-02-17 02:10:18 +03:00
parent 2c6cb8a0f5
commit 5947b910ad
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/MonitoringTest.py
View File

@ -18,6 +18,11 @@ class MonitoringCollectorTestCase(TankTestCase):
# XXX: write a better test # XXX: write a better test
assert conf assert conf
def test_inline_config(self):
mon = MonitoringCollector()
conf = mon.getconfig("<Monitoring>\n<Host address='[target]'/>\n</Monitoring>", 'localhost')
assert conf
def test_collector(self): def test_collector(self):
mon = MonitoringCollector() mon = MonitoringCollector()
mon.config = "config/mon1.conf" mon.config = "config/mon1.conf"
@ -111,6 +116,7 @@ class MonitoringCollectorTestCase(TankTestCase):
core.plugins_prepare_test() core.plugins_prepare_test()
mon = MonitoringPlugin(core) mon = MonitoringPlugin(core)
mon.monitoring.ssh_wrapper_class = SSHEmulator mon.monitoring.ssh_wrapper_class = SSHEmulator
# XXX: not working!
core.set_option(mon.SECTION, 'config', "<Monitoring>\n<Host address='[target]'/>\n</Monitoring>") core.set_option(mon.SECTION, 'config', "<Monitoring>\n<Host address='[target]'/>\n</Monitoring>")
mon.configure() mon.configure()
mon.prepare_test() mon.prepare_test()

11
yandextank/plugins/Monitoring/collector.py
View File

@ -23,11 +23,18 @@ import yandextank.core as tankcore
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
def parse_xml(config):
if os.path.exists(config):
return etree.parse(config)
else:
return etree.fromstring(config)
class Config(object): class Config(object):
"""Config reader helper""" """Config reader helper"""
def __init__(self, config): def __init__(self, config):
self.tree = etree.parse(config) self.tree = parse_xml(config)
def loglevel(self): def loglevel(self):
"""Get log level from config file. Possible values: info, debug""" """Get log level from config file. Possible values: info, debug"""
@ -476,7 +483,7 @@ class MonitoringCollector:
"""Prepare config data""" """Prepare config data"""
try: try:
tree = etree.parse(filename) tree = parse_xml(filename)
except IOError as exc: except IOError as exc:
logging.error("Error loading config: %s", exc) logging.error("Error loading config: %s", exc)
raise RuntimeError("Can't read monitoring config %s" % filename) raise RuntimeError("Can't read monitoring config %s" % filename)