web_log: minor fixes (remove lambda, typo)
Ilya committed
Jun 4, 2017 at 08:15 UTC
b89d1e0c4b188702a5311e56809a11284bd72288
2 files changed
+9
-8
conf.d/python.d/web_log.conf
+1
-1
@@ -64,7 +64,7 @@
64
# detailed_response_aggregate: yes/no # default: yes. Not aggregated detailed response codes charts
65
# all_time : yes/no # default: yes. All time unique client IPs chart (50000 addresses ~ 400KB)
66
# filter: # filter with regex
67
-# inclue: 'REGEX' # only those rows that matches the regex
67
+# include: 'REGEX' # only those rows that matches the regex
68
# exclude: 'REGEX' # all rows except those that matches the regex
69
# categories: # requests per url chart configuration
70
# cacti: 'cacti.*' # name(dimension): REGEX to match
python.d/web_log.chart.py
+8
-7
@@ -11,7 +11,6 @@ from base import LogService
11
try:
12
from itertools import filterfalse
13
except ImportError:
14
- from itertools import ifilter as filter
14
from itertools import ifilterfalse as filterfalse
15
import msg
16
@@ -299,13 +298,13 @@ class Mixin:
298
"""
299
if not self.pre_filter:
300
return raw_data
302
- parsed = raw_data
301
+ filtered = raw_data
302
for elem in self.pre_filter:
303
if elem.description == 'filter_include':
305
- parsed = filter(elem.func, parsed)
304
+ filtered = filter(elem.func, filtered)
305
elif elem.description == 'filter_exclude':
307
- parsed = filterfalse(elem.func, parsed)
308
- return parsed
306
+ filtered = filterfalse(elem.func, filtered)
307
+ return filtered
308
309
def add_new_dimension(self, dimension_id, chart_key, dimension=None,
310
algorithm='incremental', multiplier=1, divisor=1):
@@ -959,12 +958,14 @@ def check_patterns(string, dimension_regex_dict):
958
return False
959
960
def func_search(pattern):
962
- return lambda v: pattern.search(v)
961
+ def closure(v):
962
+ return pattern.search(v)
963
+ return closure
964
965
for dimension, regex in dimension_regex_dict.items():
966
valid = valid_pattern(regex)
966
- func = func_search(valid)
967
if isinstance(dimension, str) and valid_pattern:
968
+ func = func_search(valid)
969
result.append(NAMED_PATTERN(description='_'.join([string, dimension]),
970
func=func))
971
return result or None