Merge pull request #6 from shadowfax-chc/fix-replace-complex-patterns

Fix not fully replacing grok pattern to regex. see #5
garyelephant · Oct 8, 2015 · d8f9375 · d8f9375
2 parents deff161 + 3f83e0b
commit d8f9375
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/pygrok/pygrok.py b/pygrok/pygrok.py
@@ -51,7 +51,7 @@ def grok_match(text, pattern, custom_patterns = {}, custom_patterns_dir = None):
         py_regex_pattern = re.sub(r'%{(\w+)}',
             lambda m: "(" + all_patterns[m.group(1)].regex_str + ")", py_regex_pattern)
 
-        if re.search('%{\w+}', py_regex_pattern) is None:
+        if re.search('%{\w+(:\w+)?}', py_regex_pattern) is None:
             break
 
     match_obj = re.search(py_regex_pattern, text)