Changeset 14834

Timestamp:

06/29/08 16:35:59 (5 years ago)

Author:

lamanotrama

Message:

fix error messages

Files:

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

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

@@ -58 +58 @@
     $self->{parse_module}->require or croak $@;
 
-    $self->from or croak "required from";
+    $self->from or croak "required 'from'";
     $self->from->set_time_zone('local');
     DateTime->compare( $self->from, DateTime->now ) == 1
-        and croak "'from'(first value) must be past from now";
+        and croak "'from' must be past from now";
     $self->{from_time} = $self->from->epoch;
 
@@ -67 +67 @@
         $self->to->set_time_zone( 'local' );
         DateTime->compare( $self->from, $self->to ) == 1
-            and croak "must be future 'to'(second value) from 'from'(first value).";
+            and croak "must be future 'to' from 'from'";
         $self->{to_time}    = $self->to->epoch;
         $self->{delayed_to} = $self->to->clone->add( seconds => $class->parse_delay );
@@ -134 +134 @@
 
     my $rotate = $self->rotate
-        or croak "rotate is required for legacy option";
+        or croak "required rotate";
     ( $rotate =~  /^(monthly|weekly|daily)$/ )
         or croak "illegal rotate type '$rotate'";
 
     my $at = $self->rotate_at
-        or croak "at(hour and minute) is required for legacy option";
+        or croak "required rotate_at(hour and minute)";
     my ($rotate_hour, $rotate_minute) = @$at{qw/ hour minute /};
     ( $rotate_hour and $rotate_minute )
-        or croak "at must contain hour and minute";
+        or croak "rotate_at must contain hour and minute";
 
     my ($unit_type) = %{ $increment_map{$rotate} };
@@ -244 +244 @@
         my $sl = $sp->next or do { undef $self->{sp}; next; };
 
-        ## parse : from_time <= timestamp < delayed_time
+        ## parse : from_time <= timestamp < delayed_to_time
         ## return: from_time <= timestamp < to_time
         next if $sl->{timestamp} < $self->{from_time};