[prelude-cvslog] r9557 - in prelude-lml/trunk: . tests

[noreply at prelude-ids.org]

Author: yoann
Date: 2007-06-06 13:41:54 +0200 (Wed, 06 Jun 2007)
New Revision: 9557

Modified:
   prelude-lml/trunk/prelude-lml.conf.in
   prelude-lml/trunk/tests/prelude-lml.conf
Log:
Include patch from Robin Gruyters <r.gruyters at yirdis.nl>, to fix
Apache formating when Apache logname or user is set. Fix #229.


Modified: prelude-lml/trunk/prelude-lml.conf.in
===================================================================
--- prelude-lml/trunk/prelude-lml.conf.in	2007-06-06 07:50:41 UTC (rev 9556)
+++ prelude-lml/trunk/prelude-lml.conf.in	2007-06-06 11:41:54 UTC (rev 9557)
@@ -73,7 +73,7 @@
 #
 [format=apache]
 time-format = "%d/%b/%Y:%H:%M:%S"
-prefix-regex = "^(?P<hostname>\S+) - - \[(?P<timestamp>.{20}) \[+-].{4}\] "
+prefix-regex = "^(?P<hostname>\S+) \S+ \S+ \[(?P<timestamp>.{20}) \[+-].{4}\] "
 file = /var/log/apache2/access_log
 
 

Modified: prelude-lml/trunk/tests/prelude-lml.conf
===================================================================
--- prelude-lml/trunk/tests/prelude-lml.conf	2007-06-06 07:50:41 UTC (rev 9556)
+++ prelude-lml/trunk/tests/prelude-lml.conf	2007-06-06 11:41:54 UTC (rev 9557)
@@ -5,7 +5,7 @@
 
 [format=apache]
 time-format = "%d/%b/%Y:%H:%M:%S"
-prefix-regex = "^(?P<hostname>\S+) - - \[(?P<timestamp>.{20}) \+.{4}\] "
+prefix-regex = "^(?P<hostname>\S+) \S+ \S+ \[(?P<timestamp>.{20}) \+.{4}\] "
 file = -
 
 [format=apache-error]