BF: change common.conf to handle formats of syslog -v and syslog -vv in BSD

pull/204/merge^2
Daniel Black 2013-04-30 07:48:01 +10:00
parent 617fe6cb02
commit b3bd877d23
1 changed files with 7 additions and 4 deletions

View File

@ -41,7 +41,10 @@ __hostname = \S+
# #
# Common line prefixes (beginnings) which could be used in filters # Common line prefixes (beginnings) which could be used in filters
# #
# [hostname] [vserver tag] daemon_id spaces # [bsdverbose]? [hostname] [vserver tag] daemon_id spaces
# this can be optional (for instance if we match named native log files) #
__prefix_line = \s*(?:%(__hostname)s )?(?:%(__kernel_prefix)s )?(?:@vserver_\S+ )?%(__daemon_combs_re)s?\s* # bsdverbose is where syslogd is started with -v or -vv and results in <4.3> or
# <auth.info> appearing before the host as per testcases/files/logs/bsd/*.
#
# This can be optional (for instance if we match named native log files)
__prefix_line = \s*(<[^.]+.[^.]+>)?\s*(?:%(__hostname)s )?(?:%(__kernel_prefix)s )?(?:@vserver_\S+ )?%(__daemon_combs_re)s?\s*