+
+=cut
+
sub error {
my $self = shift;
my $error = join(" ", @_);
- my @backtrace = $self->backtrace;
- $error .= "\n\t" . join( "\n\t", @backtrace ) if @backtrace;
+ if ( $error =~ m{(.+)}s ) {
+ return qq|$1
|;
+ }
+
+ my $fatal = '';
+ my $backtrace = '';
+
+ if ( $error !~ m{\n$} ) {
+ if ( my @backtrace = $self->backtrace ) {
+ $backtrace =
+ "\n" . $self->html_self . "->error backtrace\n\t"
+ . $self->html_links( join( "\n\t", @backtrace ) )
+ ;
+ $fatal = qq| frey-fatal|;
+ }
+ }
warn "ERROR: $error\n";
- return
- qq||
- . $self->editor_links( $error ) .
- qq|
|
- ;
+ $self->add_icon('error');
+ $error = $self->html_links( $error );
+ return qq|$error $backtrace
| ;
}
=head1 Status line
@@ -350,8 +466,8 @@
sub add_status {
my ( $self, $data ) = @_;
- push @status, { 'X' => [ $self->backtrace ] };
- if ( ref($data) ) {
+ die "no data" unless $data;
+ if ( ref $data ) {
push @status, $data;
} else {
if ( defined $status[ $#status ] ) {
@@ -366,20 +482,19 @@
Called at beginning of each request
- $self->clean_status;
+ $self->setup_request;
=cut
-sub clean_status {
+sub setup_request {
my ($self) = shift;
+ warn "## clean_status";
@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::Class::Browser->new( usage_sort => 1, usage_on_top => 0 )->as_markup },
+ { 'Bookmarklets' => Frey::Bookmarklet->new->as_markup },
+ { 'INC' => Frey::INC->new->as_markup },
);
- $icon_html = '';
}
=head2 status_parts
@@ -403,53 +518,6 @@
=cut
-=head2 add_icon
-
- Frey::Foo->add_icon; # /static/icons/Frey/Foo.png
- Frey::Foo->add_icon('warning'); # /static/icons/Frey/Foo/warning.png
-
-=cut
-
-sub icon_path {
- my ($self,$class,$variant) = @_;
- my $icon = $class;
- $icon =~ s{::}{/}g;
- $icon .= "/$variant" if $variant;
- my $path = 'static/icons/' . $icon . '.png';
- if ( -e $path ) {
- warn "# $class from $self icon_path $path" if $self->debug;
- return $path;
- } else {
- $self->TODO( "add $path icon for $class" );
- return undef;
- }
-}
-
-sub add_icon {
- my ($self,$variant) = @_;
-
- my $class = ref($self);
- $class = $self->class if $self->can('class');
- my $icon_path = $self->icon_path( $class, $variant ) || return;
-
- $icon_html .= qq||;
- warn "# using icon $icon_path";
-
-=for later
-
- # FIXME http://en.wikipedia.org/wiki/Favicon suggest just rel="icon" but that doesn't seem to work!
- my $ico_path = $icon_path;
- $ico_path =~ s{png$}{ico};
- if ( ! -e $ico_path ) {
- system "convert $icon_path $ico_path";
- warn "# convert $icon_path $ico_path : $@";
- }
- $icon_html .= qq|| if -e $ico_path;
-
-=cut
-
-}
-
my $warn_colors = {
'#' => '#444',
'##' => '#888',
@@ -462,13 +530,31 @@
'"' => '"',
};
+=for later
+
my $multiline_re = '[\\' . join('\\', keys %$multiline_markers ) . ']';
warn "## multiline markers ", dump( $multiline_markers ), " -> $multiline_re";
+=cut
+
sub log_path {
- $Frey::Bootstrap::log_path || warn "no log_path?";
+ $Frey::Bootstrap::log_path || die "no log_path?";
+}
+
+our $pwd = `pwd`;
+chomp $pwd;
+
+sub strip_full_path {
+ my ($self, $msg) = @_;
+ # Mojo seems to expand warn messages to full path which is annoying
+ $msg =~ s{/[^/]+/\.\./}{/}gs;
+ $msg =~ s{$pwd/*}{}gs;
+ return $msg;
}
+our $last_log_pos = 0;
+our $last_log_line = 0;
+
sub warnings_html {
my ($self,$level) = shift;
$level ||= $self->debug,
@@ -477,7 +563,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 +577,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
@@ -520,7 +609,7 @@
if ( m{^(#*)} ) {
my $level = $1;
- my $msg = $_;
+ my $msg = $self->strip_full_path( $_ );
my $spacer = ' ';
my $real_msg = expand( $msg );
@@ -545,7 +634,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;
@@ -559,8 +650,8 @@
return
# need to wrap editor link into span so we can have links in warnings
qq||
+ . $self->html_links( $warnings )
+ . qq|