From 0f3ad6f2db26fb91190e47c89f77fb59b7601b84 Mon Sep 17 00:00:00 2001 From: Yujun Zhang Date: Thu, 9 Feb 2017 10:12:39 +0800 Subject: Refactoring collector initialization in plan loader - move ClassProps to module - collectors should be array in plan definition Change-Id: I37d85dbc977c91aa1bb81de45b5e1c41660e6d1f Signed-off-by: Yujun Zhang --- qtip/collector/base.py | 13 +++++++++++++ qtip/collector/logfile.py | 8 ++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) (limited to 'qtip/collector') diff --git a/qtip/collector/base.py b/qtip/collector/base.py index 2a25455c..e7f9756f 100644 --- a/qtip/collector/base.py +++ b/qtip/collector/base.py @@ -8,7 +8,20 @@ ############################################################################## +from qtip.base.constant import BaseProp + + class BaseCollector(object): """performance metrics collector""" def __init__(self, config): self._config = config + + +class CollectorProp(BaseProp): + TYPE = 'type' + LOGS = 'logs' + FILENAME = 'filename' + GREP = 'grep' + REGEX = 'regex' + CAPTURE = 'capture' + PATHS = 'path' diff --git a/qtip/collector/logfile.py b/qtip/collector/logfile.py index 19780aaa..6ed5aafd 100644 --- a/qtip/collector/logfile.py +++ b/qtip/collector/logfile.py @@ -9,16 +9,20 @@ from base import BaseCollector -from qtip.base.constant import CollectorProp as CProp +from qtip.collector.base import CollectorProp as CProp from qtip.loader.file import FileLoader class LogfileCollector(BaseCollector): """collect performance metrics from log files""" - def __init__(self, config, paths=None): + TYPE = 'logfile' + + def __init__(self, config, parent=None): super(LogfileCollector, self).__init__(config) + paths = [config[CProp.PATHS]] if CProp.PATHS in config else ['.'] self.loader = FileLoader('.', paths) + self._parent = parent def collect(self): captured = {} -- cgit 1.2.3-korg