duplicate code moved to parse()
Evgeniy Kostenko committed
Aug 2, 2018 at 08:29 UTC
428774eacc80436f294a12abcd3bba0b877c2e55
1 file changed
+11
-11
python.d/monit.chart.py
+11
-11
@@ -80,27 +80,27 @@ class Service(UrlService):
80
self.order = ORDER
81
self.definitions = CHARTS
82
83
+ def parse(self, data):
84
+ try:
85
+ xml = ET.fromstring(data)
86
+ except ET.ParseError:
87
+ self.debug('%s is not a vaild XML page. Please add "_status?format=xml&level=full" to monit URL.' % self.url)
88
+ return None
89
+ return xml
90
+
91
def check(self):
92
self._manager = self._build_manager()
93
raw_data = self._get_raw_data()
94
if not raw_data:
95
return None
88
- try:
89
- xml = ET.fromstring(raw_data)
90
- return True
91
- except ET.ParseError:
92
- self.debug('%s is not a vaild XML page. Please add "_status?format=xml&level=full" to monit URL.' % self.url)
93
- return None
96
+ return bool(self.parse(raw_data))
97
98
def _get_data(self):
99
raw_data = self._get_raw_data()
100
if not raw_data:
101
return None
99
-
100
- try:
101
- xml = ET.fromstring(raw_data)
102
- except ET.ParseError:
103
- self.debug('%s is not a vaild XML page. Please add "_status?format=xml&level=full" to monit URL.' % self.url)
102
+ xml = self.parse(raw_data)
103
+ if not xml:
104
return None
105
106
data = {}