Changeset 14851 for lang/perl/Parse-Syslog-Period

Timestamp:

06/29/08 20:56:43 (5 years ago)

Author:

lamanotrama

Message:

_parse_rotatestatus: parse glob. logfiles_by_* returns array_ref

Files:

• lang/perl/Parse-Syslog-Period/trunk/lib/Parse/Syslog/Period/Parser.pm (modified) (8 diffs)

lang/perl/Parse-Syslog-Period/trunk/lib/Parse/Syslog/Period/Parser.pm

@@ -73 +73 @@
     }
 
-    $self->rotate eq 'macro'? $self->set_logfiles_by_macro
-                            : $self->set_logfiles_by_legacy;
+    $self->{logfiles} = $self->rotate eq 'macro'? $self->logfiles_by_macro
+                                                : $self->logfiles_by_legacy;
     return $self;
 }
@@ -85 +85 @@
     return $self;
 }
+
+sub next {
+    my $self = shift;
+    return if $self->{exit_flag};
+
+    while ( my $sp = $self->{sp} ||= $self->get_next_sp ) {
+        my $sl = $sp->next or do { undef $self->{sp}; next; };
+
+        ## parse : from_time <= timestamp < delayed_to_time
+        ## return: from_time <= timestamp < to_time
+        next if $sl->{timestamp} < $self->{from_time};
+        return $sl unless $self->{to_time};
+
+        if ( $self->{delayed_to_time} <= $sl->{timestamp} ) {
+            $self->{exit_flag} = 1;
+            return;
+        }
+     
+        return $sl if $sl->{timestamp} < $self->{to_time};
+    }
+
+    return;
+}
+
+sub get_next_sp {
+    my $self = shift;
+
+    while ( my $logfile = $self->logfiles->[ $self->{target_idx}++ ] ) {
+        my ($name, $year) = @$logfile{qw/ name year /};
+        next unless -r $name;
+
+        return $self->{parse_module}->new(
+            $name,
+            year => $year,
+            %{ $self->{for_parse_module} },
+        );
+    }
+
+    return;
+}
    
-sub set_logfiles_by_macro {
-    my $self = shift;
-
+sub logfiles_by_macro {
+    my $self = shift;
+
+    my $logfiles = [];
     my $from = $self->from;
     my $to   = $self->{delayed_to} ||= DateTime->now->set_time_zone( 'local' );
-    $self->{logfiles} = [];
     $self->{rotate} = undef;
     $self->{patterned_file} = $self->file;
@@ -101 +141 @@
     }
 
-    if ( my $rotate = $self->rotate ) {
-        my $increment = $increment_map{$rotate};
-        ( my $truncate_to = (keys %$increment)[0] ) =~ s/s$//;
-        my $rotated_on = $from->clone->truncate( to => $truncate_to );
-
-        while ( DateTime->compare( $rotated_on, $to ) != 1 ) {
-            my $logfile = {
-                name => $rotated_on->strftime( $self->patterned_file ),
-                year => $rotated_on->year, 
-            };
-            push @{ $self->logfiles }, $logfile;
-            $rotated_on->add( $increment );
-        }
-
-    } else {
-        $self->{logfiles} = [
-            {   name => $self->patterned_file,
-                year => $from->year,
-            },
-        ];
-   }
-
-    return $self;
-}
-
-sub set_logfiles_by_legacy {
-    my $self = shift;
-
+    $self->rotate or return [
+        {   name => $self->patterned_file,
+            year => $from->year,
+        },
+    ];
+
+    my $increment = $increment_map{ $self->rotate };
+    ( my $truncate_to = (keys %$increment)[0] ) =~ s/s$//;
+    my $rotated_on = $from->clone->truncate( to => $truncate_to );
+
+    while ( DateTime->compare( $rotated_on, $to ) != 1 ) {
+        my $logfile = {
+            name => $rotated_on->strftime( $self->patterned_file ),
+            year => $rotated_on->year, 
+        };
+        push @$logfiles, $logfile;
+        $rotated_on->add( $increment );
+    }
+
+    return $logfiles;
+}
+
+sub logfiles_by_legacy {
+    my $self = shift;
+
+    $logfiles = [];
     my $from = $self->from;
     my $to   = $self->{delayed_to} ||= DateTime->now->set_time_zone( 'local' );
-    $self->{logfiles} = [];
 
     my $rotate = $self->rotate
         or croak "required rotate";
     ( $rotate =~  /^(monthly|weekly|daily)$/ )
-        or croak "illegal rotate type '$rotate'";
+        or croak "invalid rotate type '$rotate'";
 
     my $at = $self->rotate_at
-        or croak "required rotate_at(hour and minute)";
+        or croak "required rotate_at";
     my ($rotate_hour, $rotate_minute) = @$at{qw/ hour minute /};
     ( $rotate_hour and $rotate_minute )
         or croak "rotate_at must contain hour and minute";
-
-    my ($unit_type) = %{ $increment_map{$rotate} };
 
     my $last_rotated_date = $self->_parse_rotatestatus(
@@ -151 +186 @@
     ); 
 
-    if ( !$last_rotated_date ) {
-        $self->{logfiles} = [
-            {   name => $self->file,
-                year => DateTime->now->set_time_zone( 'local' )->year,
-            },
-        ];
-        return;
-    }
+    $last_rotated_date  or return [
+        {   name => $self->file,
+            year => DateTime->now->set_time_zone( 'local' )->year,
+        },
+    ];
 
     my $last_rotated_on = DateTime->new(
@@ -167 +199 @@
     );
 
-    if ( DateTime->compare( $from, $last_rotated_on ) == 1 ) {
-        $self->{logfiles} = [
-            { name => $self->file,
-              year => $last_rotated_on->year,
-            },
-        ];
-        return;
-    }
-
+    DateTime->compare( $from, $last_rotated_on ) == 1 or return [
+        { name => $self->file,
+          year => $last_rotated_on->year 
+        },
+    ];
+
+    my ( $unit_type ) = %{ $increment_map{$rotate} };
     my $from_dur = $self->_dur_by_unittype( $last_rotated_on, $from, $unit_type );
     my $from_suffix = $from_dur + 1;
@@ -195 +225 @@
             year => $rotated_on->year,
         };
-        push @{ $self->logfiles }, $logfile;
+        push @$logfiles, $logfile;
         $rotated_on->add( $unit_type => 1 );
-    }       
+    }
+
+    return $logfiles;
 }
 
@@ -212 +244 @@
     $statefile ||= '/var/lib/logrotate.status';
     -f $statefile
-        or croak "can't find logrotate statefile. please set rotate_statefile";
-    my $state_h = Path::Class::file( $statefile )->open( 'r' ) or croak $!;
-    my ( $year, $month, $day );
-
-    while ( my $line = <$state_h> ) {
-        chomp $line;
-        my ( $name, $status ) = $line =~ /^"(.*?)"[ ](.*)$/mxs;
-        ( $name and $status ) or next;
-        $name eq $file or next;
-        ( $year, $month, $day ) = split "-", $status;
-        ( $year and $month and $day )
-            or croak "parsing $statefile failed";
-        last;
-    }
-
-    close $state_h or croak $!;
-        
+        or croak "can't find logrotate statefile. please set the rotate_statefile";
+
+    my @statuses = Path::Class::file($statefile)->slurp( chomp => 1 ) or croak $!;
+    my ( $status_line ) = grep /^"$file"[ ]/mxs, @statuses;
+
+    if ( !$status_line ) {
+        for my $line (@statuses) {
+            my ( $meta ) = $line =~ qr{^"(.+)"[ ]}sx    or next;
+            grep {$_ eq $file} glob $meta   or next;
+            $status_line = $line and last;
+        }
+    }
+
+    $status_line or return;
+    my ( $date ) = $status_line =~ /"[ ](.*)$/mxs;
+    my ( $year, $month, $day ) = split( "-", $date || '' );
+    ( $year and $month and $day )
+        or croak "parsing $statefile failed";
+
     return {
         year   => $year,
@@ -236 +270 @@
 }
 
-sub next {
-    my $self = shift;
-    return if $self->{exit_flag};
-
-    while ( my $sp = $self->{sp} ||= $self->get_next_sp ) {
-        my $sl = $sp->next or do { undef $self->{sp}; next; };
-
-        ## parse : from_time <= timestamp < delayed_to_time
-        ## return: from_time <= timestamp < to_time
-        next if $sl->{timestamp} < $self->{from_time};
-        return $sl unless $self->{to_time};
-
-        if ( $self->{delayed_to_time} <= $sl->{timestamp} ) {
-            $self->{exit_flag} = 1;
-            return;
-        }
-     
-        return $sl if $sl->{timestamp} < $self->{to_time};
-    }
-
-    return;
-}
-
-sub get_next_sp {
-    my $self = shift;
-
-    while ( my $logfile = $self->logfiles->[ $self->{target_idx}++ ] ) {
-        my ($name, $year) = @$logfile{qw/ name year /};
-        next unless -r $name;
-
-        return $self->{parse_module}->new(
-            $name,
-            year => $year,
-            %{ $self->{for_parse_module} },
-        );
-    }
-
-    return;
-}
-
 
 1;