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

Merge pull request #271 from f2nd/overload_old_mon

Browse Source 
Hotfix for old monitoring plugin
This commit is contained in:
Alexey Lavrenuke 2016-09-19 15:53:32 +03:00 committed by GitHub
commit 00f7a6c42c
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
yandextank/plugins/Overload/plugin.py
View File

@ -17,7 +17,8 @@ from ..Autostop import Plugin as AutostopPlugin
from ..Console import Plugin as ConsolePlugin
from ..JMeter import Plugin as JMeterPlugin
from ..Pandora import Plugin as PandoraPlugin
from ..Telegraf import Plugin as MonitoringPlugin
from ..Telegraf import Plugin as TelegrafPlugin
from ..Monitoring import Plugin as MonitoringPlugin
from ..Phantom import Plugin as PhantomPlugin
from .client import OverloadClient
@ -52,6 +53,7 @@ class Plugin(AbstractPlugin, AggregateResultListener, MonitoringDataListener):
self.is_regression = None
self.ignore_target_lock = None
self.port = None
self.mon = None
@staticmethod
def get_key():
@ -128,13 +130,16 @@ class Plugin(AbstractPlugin, AggregateResultListener, MonitoringDataListener):
self.jobno_file = self.get_option("jobno_file", '')
try:
mon = self.core.get_plugin_of_type(MonitoringPlugin)
self.mon = self.core.get_plugin_of_type(TelegrafPlugin)
except KeyError:
logger.debug("Monitoring plugin not found:", exc_info=True)
mon = None
logger.debug("Telegraf plugin not found:", exc_info=True)
try:
self.mon = self.core.get_plugin_of_type(MonitoringPlugin)
except KeyError:
logger.debug("Monitoring plugin not found:", exc_info=True)
if mon and mon.monitoring:
mon.monitoring.add_listener(self)
if self.mon and self.mon.monitoring:
self.mon.monitoring.add_listener(self)
self.__save_conf()