Merge pull request #1794 from szepeviktor/patch-15

fixed grep pattern: escape dot-char in search-IP and more restrictive boundaries (IPv6-capability)
pull/1787/merge
Serg G. Brester 8 years ago committed by GitHub
commit 5482e0bbe7

@ -5,7 +5,7 @@
# (printf %%b "Log-excerpt contains 'test':\n"; %(_grep_logs)s; printf %%b "Log-excerpt contains 'test':\n") | mail ... # (printf %%b "Log-excerpt contains 'test':\n"; %(_grep_logs)s; printf %%b "Log-excerpt contains 'test':\n") | mail ...
# #
_grep_logs = logpath="<logpath>"; grep <grepopts> -E %(_grep_logs_args)s $logpath | <greplimit> _grep_logs = logpath="<logpath>"; grep <grepopts> -E %(_grep_logs_args)s $logpath | <greplimit>
_grep_logs_args = '(^|[^0-9])<ip>([^0-9]|$)' _grep_logs_args = "(^|[^0-9a-fA-F:])$(echo '<ip>' | sed 's/\./\\./g')([^0-9a-fA-F:]|$)"
# Used for actions, that should not by executed if ticket was restored: # Used for actions, that should not by executed if ticket was restored:
_bypass_if_restored = if [ '<restored>' = '1' ]; then exit 0; fi; _bypass_if_restored = if [ '<restored>' = '1' ]; then exit 0; fi;

Loading…
Cancel
Save