--- trunk/lib/Frey/Web.pm 2008/11/29 17:48:54 625 +++ trunk/lib/Frey/Web.pm 2008/11/30 19:21:52 648 @@ -25,7 +25,10 @@ is => 'rw', isa => 'Uri', coerce => 1, required => 1, -# default => '/', + default => sub { + cluck "undefined request_url"; + '/'; + }, ); has 'title' => ( @@ -64,7 +67,7 @@ is => 'rw', isa => 'Int', # required => 1, # FIXME we can't have required fields with defaults because Frey::Action isn't smart enough and asks for them - default => 120, + default => 250, ); my %escape = ('<'=>'<', '>'=>'>', '&'=>'&', '"'=>'"'); @@ -242,7 +245,7 @@ qq| reload - $exit + $exit |; @@ -463,9 +466,12 @@ warn "## multiline markers ", dump( $multiline_markers ), " -> $multiline_re"; sub log_path { - $Frey::Bootstrap::log_path || warn "no log_path?"; + $Frey::Bootstrap::log_path || die "no log_path?"; } +our $last_log_pos = 0; +our $last_log_line = 0; + sub warnings_html { my ($self,$level) = shift; $level ||= $self->debug, @@ -474,7 +480,7 @@ my $max = 30; my $pos = 0; my @warnings = ( '' x $max ); # XXX circualar buffer for 50 lines - my $line = 0; + my $line = $last_log_line; my $multiline_end; # XXX do we really want to do this every time? @@ -488,11 +494,14 @@ } $self->add_css( $css ); - open(my $log, '<', $path) || die "can't open $path: $!"; + open(my $log, '<', $path) || die "can't open $path: $!"; + seek($log, $last_log_pos, 0) || warn "can't seek: $!"; while(<$log>) { chomp; $line++; + next if m{^\s+(Mojo|Class::MOP|Moose)::}; + my $style = ''; =for filter @@ -542,7 +551,9 @@ $warnings[ $pos++ % $max ] = $msg; } } - warn "log has $line lines tell position ",tell($log); + $last_log_pos = tell($log); + $last_log_line = $line; + warn "log has $line lines tell position $last_log_pos"; close($log) || die "can't close $path: $!"; my $size = -s $path; @@ -557,7 +568,7 @@ # need to wrap editor link into span so we can have links in warnings qq|warn| . $self->editor_links( $warnings ) - . qq|| + . qq|| ; }