Merge pull request #1952 from ktsaou/master

[netdata.git] / python.d / tomcat.chart.py

diff --git a/python.d/tomcat.chart.py b/python.d/tomcat.chart.py
index a6485fd5016712ce35ec06aaf326c127db2a39fa..c20f85e1ecd2818a6b87386e1f2e8d1c368f7591 100644 (file)
--- a/python.d/tomcat.chart.py
+++ b/python.d/tomcat.chart.py
@@ -51,10 +51,6 @@ class Service(UrlService):
         self.definitions = CHARTS
 
     def check(self):
-        if not self.url.endswith('manager/status?XML=true'):
-            self.error('Bad url(%s). Must be http://<ip.address>:<port>/manager/status?XML=true' % self.url)
-            return False
-
         netloc = urlparse(self.url).netloc.rpartition(':')
         if netloc[1] == ':': port = netloc[2]
         else: port = 80
@@ -72,9 +68,9 @@ class Service(UrlService):
         """
         data = self._get_raw_data()
         if data:
-            jvm = self.regex_jvm.findall(data)
-            connector = self.regex_connector.findall(data)
-            data = dict(self.regex.findall(''.join([jvm[0] if jvm else '',
-                                                    connector[0] if connector else ''])))
+            jvm = self.regex_jvm.findall(data) or ['']
+            connector = self.regex_connector.findall(data) or ['']
+            data = dict(self.regex.findall(''.join([jvm[0], connector[0]])))
         
         return data or None
+