+
+=cut
+
sub error {
my $self = shift;
my $error = join(" ", @_);
- my @backtrace = $self->backtrace;
- $error .= "\n\t" . join( "\n\t", @backtrace ) if @backtrace;
+ my $fatal = '';
+
+ if ( $error !~ m{\n$} ) {
+ if ( my @backtrace = $self->backtrace ) {
+ $error .= "\n\t" . join( "\n\t", @backtrace );
+ $fatal = qq| frey-fatal|;
+ }
+ }
warn "ERROR: $error\n";
return
- qq||
- . $self->editor_links( $error ) .
+ qq||
+ . $self->html_links( $error ) .
qq|
|
;
}
@@ -372,7 +410,7 @@
@status = (
{ 'ClassBrowser' => Frey::ClassBrowser->new( usage_on_top => 0 )->as_markup },
{ 'Bookmarklets' => Frey::Bookmarklet->new->as_markup },
- { 'INC' => Frey::INC->new->as_markup },
+ { 'INC' => Frey::INC->new->as_markup },
);
$icon_html = '';
}
@@ -457,13 +495,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,
@@ -472,7 +528,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?
@@ -486,11 +542,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
@@ -515,7 +574,7 @@
if ( m{^(#*)} ) {
my $level = $1;
- my $msg = $_;
+ my $msg = $self->strip_full_path( $_ );
my $spacer = ' ';
my $real_msg = expand( $msg );
@@ -532,19 +591,23 @@
$msg = qq|$msg|;
}
- $msg .= $spacer .
- qq|+$line\n|;
+ #$msg .= $spacer . qq|$line\n|;
+ $msg = qq|$line$msg|
+ . ( $spacer ? $spacer : '' )
+ . "\n"; # XXX needs this
$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;
my $warnings = join("",
- map { $warnings[ ( $pos + $_ ) % $max ] || '' } 1 .. $max
+ map { $warnings[ ( $pos + $_ ) % $max ] || '' } 0 .. ( $max - 1 )
);
my $s = length($warnings);
@@ -552,8 +615,8 @@
return
# need to wrap editor link into span so we can have links in warnings
qq||
+ . $self->html_links( $warnings )
+ . qq||
;
}
@@ -579,7 +642,7 @@
) = caller($_) or last;
push @backtrace,
- qq|via $package at $path line $line|;
+ qq|via "$package" at $path line $line|;
}
#warn "# backtrace: ", dump( @backtrace ) if @backtrace;
return @backtrace;