From fa727586ff5f21898d50ad4931b2b777576023ae Mon Sep 17 00:00:00 2001 From: chtheis Date: Mon, 10 Dec 2018 17:11:41 +0000 Subject: [PATCH] Fix grep pattern to deal with Apache's error log Apache's error log appends the port to the IP address, other logs don't. --- config/action.d/helpers-common.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/action.d/helpers-common.conf b/config/action.d/helpers-common.conf index b036f68f..195de60d 100644 --- a/config/action.d/helpers-common.conf +++ b/config/action.d/helpers-common.conf @@ -5,7 +5,7 @@ # (printf %%b "Log-excerpt contains 'test':\n"; %(_grep_logs)s; printf %%b "Log-excerpt contains 'test':\n") | mail ... # _grep_logs = logpath=""; grep -E %(_grep_logs_args)s $logpath | -_grep_logs_args = "(^|[^0-9a-fA-F:])$(echo '' | sed 's/\./\\./g')([^0-9a-fA-F:]|$)" +_grep_logs_args = "(^|[^0-9a-fA-F:])$(echo '' | sed 's/\./\\./g')(:\d{1,5})?([^0-9a-fA-F:]|$)" # Used for actions, that should not by executed if ticket was restored: _bypass_if_restored = if [ '' = '1' ]; then exit 0; fi;