--- trunk/lib/Frey/Web.pm 2008/11/30 16:21:07 644 +++ trunk/lib/Frey/Web.pm 2008/11/30 23:19:06 652 @@ -249,7 +249,7 @@ |; - my $svk = Frey::SVK->new; + my $svk = Frey::SVK->new( request_url => '/' ); my $info = $svk->info; my $revision = $svk->info->{Revision} || ''; $revision = $1 if $info->{'Mirrored From'} =~ m{Rev\.\s+(\d+)}; @@ -469,6 +469,12 @@ $Frey::Bootstrap::log_path || die "no log_path?"; } +our $last_log_pos = 0; +our $last_log_line = 0; + +our $pwd = `pwd`; +chomp $pwd; + sub warnings_html { my ($self,$level) = shift; $level ||= $self->debug, @@ -477,7 +483,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? @@ -491,7 +497,8 @@ } $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++; @@ -524,6 +531,10 @@ my $level = $1; my $msg = $_; + # Mojo seems to expand warn messages to full path which is annoying + $msg =~ s{/[^/]+/\.\./}{/}gs; + $msg =~ s{$pwd/*}{}gs; + my $spacer = ' '; my $real_msg = expand( $msg ); if ( length($real_msg) > $self->html_dump_width ) { @@ -547,7 +558,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; @@ -562,7 +575,7 @@ # need to wrap editor link into span so we can have links in warnings qq|warn| . $self->editor_links( $warnings ) - . qq|| + . qq|| ; }