Exit on regex compile error, Move peer_filter to check()
Sven Mäder committed
Feb 15, 2018 at 10:02 UTC
86752c8e64c38c5ba127375aa9d12075f56d5c3c
1 file changed
+8
-11
python.d/ntp.chart.py
+8
-11
@@ -131,17 +131,6 @@ class Service(SocketService):
131
self.regex_data = re.compile(r'([a-z_]+)=([0-9-]+(?:\.[0-9]+)?)(?=,)')
132
self.order = None
133
self.definitions = None
134
- self.peer_names = self.configuration.get('peer_names', True)
135
- peer_filter_start = r'^((0\.0\.0\.0)|('
136
- peer_filter_end = r'))$'
137
- peer_filter_default = r'127\..*'
138
- peer_filter_custom = str(self.configuration.get('peer_filter', peer_filter_default))
139
-
140
- try:
141
- self.regex_peer_filter = re.compile(peer_filter_start + peer_filter_custom + peer_filter_end)
142
- except re.error as error:
143
- self.error('Pattern compile error: %s, Using defaults.' % str(error))
144
- self.regex_peer_filter = re.compile(peer_filter_start + peer_filter_default + peer_filter_end)
134
135
def create_charts(self):
136
"""
@@ -255,6 +244,14 @@ class Service(SocketService):
244
If not, returns None to disable module.
245
"""
246
self._parse_config()
247
+ self.peer_names = self.configuration.get('peer_names', True)
248
+ peer_filter_custom = self.configuration.get('peer_filter', r'127\..*')
249
+
250
+ try:
251
+ self.regex_peer_filter = re.compile(r'^((0\.0\.0\.0)|({0}))$'.format(peer_filter_custom))
252
+ except re.error as error:
253
+ self.error('Pattern compile error: {0}'.format(error))
254
+ return None
255
256
self.request_systemvars = self.get_header(0, 'readvar')
257
self.request = self.request_systemvars