Changeset 17281

Timestamp:

Apr 2, 2008, 12:02:03 PM (18 years ago)

Author:

jhoblitt

Message:

fix filtering
fix handling of corrupted records & times
improved error messages
die if corrupted records make it through the parse phase

File:

• trunk/arclog/arclog.pl (modified) (6 diffs)

trunk/arclog/arclog.pl

@@ -19 +19 @@
 pod2usage( -msg => "Unknown option: @ARGV", -exitval => 2 ) if @ARGV;
 
-my $filter_records = 1;
+my $filter_records = 0;
 
 my $rcfile = "$ENV{HOME}/.arclogrc";
@@ -54 +54 @@
     my $res = $ua->request(HTTP::Request->new(GET => "http://$hostport/"));
     unless ($res->is_success) {
-        warn $res->status_line;
+        warn "can't access $hostport: ", $res->status_line;
         next;
     }
@@ -71 +71 @@
     $res= $ua->request($req);
     unless ($res->is_success) {
-        die $res->status_line;
+        die "can't access $hostport: ", $res->status_line;
     }
 
@@ -132 +132 @@
 }
 
-#use Data::Dumper;
+use Data::Dumper;
 #print Dumper(\@records);
 # sort by time
 # insert all records
-@records = sort { $a->{time} cmp $b->{time} } @records;
+@records = sort {
+    unless (defined $a->{time} && defined $b->{time}) {
+        print Dumper($a);
+        print Dumper($b);
+    }
+    $a->{time} cmp $b->{time}
+} @records;
 my $query = $dbh->prepare("INSERT OR IGNORE INTO log VALUES(?)")
         or die "database error: $!";
@@ -155 +161 @@
 
     # do not print filtered records
-    if (defined $filter_records) {
+    if ($filter_records) {
         foreach my $filter (@myfilters) {
             next RECORDS if $event =~ /$filter/;
@@ -191 +197 @@
     @row_data{qw( time device event elapse_time errors )} = @fields;
 
+    # ipp008 has been returning valid rows with completely empty fields
+    return unless defined $row_data{time};
+
     # parse time string into a DateTime object for easy sorting later
-    $row_data{time} = $strptime->parse_datetime($row_data{time});
+    my $dt = $strptime->parse_datetime($row_data{time});
+
+    unless (defined $dt) {
+#        warn "can't parse time string $row_data{time}";
+        return;
+    }
+
+    $row_data{time} = $dt;
 
     return \%row_data;