[gentoo-commits] gentoo-projects commit in forums/scripts: parsePhpbbLog.pl

[Robin H. Johnson (robbat2)]

robbat2     10/10/03 19:18:46

  Modified:             parsePhpbbLog.pl
  Log:
  Fixup whitespace issues, and recognize invalid referrer strings.

Revision  Changes    Path
1.4                  forums/scripts/parsePhpbbLog.pl

file : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/forums/scripts/parsePhpbbLog.pl?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-projects/forums/scripts/parsePhpbbLog.pl?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/forums/scripts/parsePhpbbLog.pl?r1=1.3&r2=1.4

Index: parsePhpbbLog.pl
===================================================================
RCS file: /var/cvsroot/gentoo-projects/forums/scripts/parsePhpbbLog.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -p -w -b -B -u -u -r1.3 -r1.4
--- parsePhpbbLog.pl	26 Sep 2010 18:44:23 -0000	1.3
+++ parsePhpbbLog.pl	3 Oct 2010 19:18:46 -0000	1.4
@@ -41,7 +41,8 @@ while(my $rawline = <>) {
   chomp $rawline;
 
   # Chomp the syslog header
-  my ($syslog_header, $syslog_data) = $rawline =~ m/^(... \d\d \d\d:\d\d:\d\d \w+ \w+\[\d+\]: )(.*)/;
+  my ($syslog_header, $syslog_data) = $rawline =~ m/^(... [\d ]\d \d\d:\d\d:\d\d \w+ \w+\[\d+\]:\s+)(.*)/;
+  $syslog_data =~ s/^\s*|\s*$//g;
 
   # Did this actually come from phpbb? We don't give a damn about the rest
   if($syslog_header =~ /phpbb/) {
@@ -49,7 +50,8 @@ while(my $rawline = <>) {
     #    0     1   2   3      4     5     6    7    8    9
     # The weird regex for $req and $ref are due to some weird clients that are
     # sending " and spaces in them.
-    my @phpbb_logentry = $syslog_data =~ m/^([SE]) ([\d\w]*) ([\d.]+) ([-\w\d.]+) ([-\w\d]+|-) (\[\d\d\/\w\w\w\/\d{4}(?::\d{1,2}){3}\.\d+ \+\d{4}\]) ("\w+ .* HTTP\/[\d\.]+") (\d+|-) ("\w+:\/+.*"|"-") ("+[^"]+"+)/;
+    #my @phpbb_logentry = $syslog_data =~ m/^\s*([SE])\s*([\d\w]*)\s*([\d.]+)\s*([-\w\d.]+)\s*([-\w\d]+|-)\s*(\[\d\d\/\w\w\w\/\d{4}(?::\d{1,2}){3}\.\d+ \+\d{4}\])\s*("\w+ .* HTTP\/[\d\.]+") (\d+|-)\s*("\w+:\/+.*"|"-")\s*("+[^"]+"+)$/;
+    my @phpbb_logentry = $syslog_data =~ m/^\s*([SE])\s*([\d\w]*)\s*([\d.]+)\s*([-\w\d.]+)\s*([-\w\d]+|-)\s*(\[\d\d\/\w\w\w\/\d{4}(?::\d{1,2}){3}\.\d+ \+\d{4}\])\s*("\w+ .* HTTP\/[\d\.]+")\s*(\d+|-)\s*("\w+:\/+.*"|"-"|"[^"]+")\s*("+[^"]+"+)$/;
     #print "=S=\n".Dumper(@phpbb_logentry)."=E=\n";
     
     # We have a bug in the code somewhere that is dropping the id...
@@ -84,12 +86,12 @@ while(my $rawline = <>) {
       $stat_end++;
     } else {
       $stat_syslog_phpbbtype++;
-      printf("SYSLOG:UNKNWON-PHPBB-ENTRY-TYPE:%d type=%s %s",$lineno, $phpbb_logentry[0], $syslog_data);
+      printf("SYSLOG:UNKNOWN-PHPBB-ENTRY-TYPE:%d type=%s line=%s\n",$lineno, $phpbb_logentry[0], $syslog_data);
     }
 
   } else {
     $stat_syslog_nonphpbb++;
-    printf("SYSLOG:NON-PHPBB:%d %s",$lineno,$rawline);
+    printf("SYSLOG:NON-PHPBB:%d %s\n",$lineno,$rawline);
   }
   $lineno++;
 }