--- trunk/lib/Frey/Web.pm 2008/11/29 22:45:22 629
+++ trunk/lib/Frey/Web.pm 2008/11/30 23:49:32 653
@@ -7,7 +7,7 @@
#use Continuity::Widget::DomNode;
use Data::Dump qw/dump/;
-use Carp qw/confess cluck/;
+use Carp qw/confess cluck carp/;
use File::Slurp;
use Frey::Bookmarklet;
@@ -26,7 +26,7 @@
isa => 'Uri', coerce => 1,
required => 1,
default => sub {
- cluck "undefined request_url";
+ carp "undefined request_url";
'/';
},
);
@@ -67,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 = ('<'=>'<', '>'=>'>', '&'=>'&', '"'=>'"');
@@ -245,7 +245,7 @@
qq|
reload
- $exit
+ $exit
|;
@@ -373,11 +373,10 @@
sub clean_status {
my ($self) = shift;
@head = ( 'static/frey.css' );
- my $params = { request_url => $self->request_url };
@status = (
- { 'ClassBrowser' => Frey::ClassBrowser->new( %$params, usage_on_top => 0 )->as_markup },
- { 'Bookmarklets' => Frey::Bookmarklet->new( %$params )->as_markup },
- { 'INC' => Frey::INC->new( %$params )->as_markup },
+ { 'ClassBrowser' => Frey::ClassBrowser->new( usage_on_top => 0 )->as_markup },
+ { 'Bookmarklets' => Frey::Bookmarklet->new->as_markup },
+ { 'INC' => Frey::INC->new->as_markup },
);
$icon_html = '';
}
@@ -469,6 +468,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 +482,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,11 +496,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
@@ -522,6 +530,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 ) {
@@ -545,7 +557,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;
@@ -560,7 +574,7 @@
# need to wrap editor link into span so we can have links in warnings
qq||
+ . qq||
;
}