require Exporter;
@ISA = qw(Exporter);
-@EXPORT = qw(dbginit dbg dbgadd dbgsub dbglist isdbg dbgclose confess croak cluck cluck);
+@EXPORT = qw(dbginit dbg dbgadd dbgsub dbglist dbgdump dbglog isdbg dbgclose confess croak cluck);
use strict;
-use vars qw(%dbglevel $fp);
+use vars qw(%dbglevel $fp $callback $cleandays $keepdays);
use DXUtil;
use DXLog ();
-use Carp qw(cluck);
+use Carp ();
%dbglevel = ();
-$fp = DXLog::new('debug', 'dat', 'd');
+$fp = undef;
+$callback = undef;
+$keepdays = 10;
+$cleandays = 100;
+
+use vars qw($VERSION $BRANCH);
+$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /^\d+\.\d+(?:\.(\d+)\.(\d+))$/ || (0,0));
+$main::build += $VERSION;
+$main::branch += $BRANCH;
# Avoid generating "subroutine redefined" warnings with the following
# hack (from CGI::Carp):
local $^W=0;
eval qq( sub confess {
\$SIG{__DIE__} = 'DEFAULT';
- DXDebug::_store(\$@, Carp::shortmess(\@_));
+ DXDebug::dbg(\$@);
+ DXDebug::dbg(Carp::shortmess(\@_));
exit(-1);
}
sub croak {
\$SIG{__DIE__} = 'DEFAULT';
- DXDebug::_store(\$@, Carp::longmess(\@_));
+ DXDebug::dbg(\$@);
+ DXDebug::dbg(Carp::longmess(\@_));
exit(-1);
}
- sub carp { DXDebug::_store(Carp::shortmess(\@_)); }
- sub cluck { DXDebug::_store(Carp::longmess(\@_)); }
+ sub carp { DXDebug::dbg(Carp::shortmess(\@_)); }
+ sub cluck { DXDebug::dbg(Carp::longmess(\@_)); }
);
CORE::die(Carp::shortmess($@)) if $@;
} else {
- eval qq( sub confess { Carp::confess(\@_); };
- sub cluck { Carp::cluck(\@_); };
+ eval qq( sub confess { die Carp::longmess(\@_); };
+ sub croak { die Carp::shortmess(\@_); };
+ sub cluck { warn Carp::longmess(\@_); };
+ sub carp { warn Carp::shortmess(\@_); };
);
}
-sub _store
+sub dbg($)
{
+ return unless $fp;
my $t = time;
for (@_) {
- chomp;
- my @l = split /\n/;
+ my $r = $_;
+ chomp $r;
+ my @l = split /\n/, $r;
for (@l) {
- my $l = $_;
- $l =~ s/([\x00\x08\x0B-\x1f\x7f-\xff])/uc sprintf("%%%02x",ord($1))/eg;
+ s/([\x00-\x08\x0B-\x1f\x7f-\xff])/uc sprintf("%%%02x",ord($1))/eg;
print "$_\n" if defined \*STDOUT;
- $fp->writeunix($t, "$t^$_");
+ my $str = "$t^$_";
+ &$callback($str) if $callback;
+ $fp->writeunix($t, $str);
}
}
}
sub dbginit
{
+ $callback = shift;
+
# add sig{__DIE__} handling
if (!defined $DB::VERSION) {
- $SIG{__WARN__} = sub { _store($@, Carp::shortmess(@_)); };
- $SIG{__DIE__} = sub { _store($@, Carp::longmess(@_)); };
+ $SIG{__WARN__} = sub {
+ if ($_[0] =~ /Deep\s+recursion/i) {
+ dbg($@);
+ dbg(Carp::longmess(@_));
+ CORE::die;
+ } else {
+ dbg($@);
+ dbg(Carp::shortmess(@_));
+ }
+ };
+
+ $SIG{__DIE__} = sub { dbg($@); dbg(Carp::longmess(@_)); };
}
+
+ $fp = DXLog::new('debug', 'dat', 'd');
}
sub dbgclose
{
$SIG{__DIE__} = $SIG{__WARN__} = 'DEFAULT';
- $fp->close();
+ $fp->close() if $fp;
+ undef $fp;
}
-sub dbg
+sub dbgdump
{
my $l = shift;
- if ($dbglevel{$l} || $l eq 'err') {
- my @in = @_;
- my $t = time;
- for (@in) {
- s/\n$//o;
- s/\a//og; # beeps
- print "$_\n" if defined \*STDOUT;
- $fp->writeunix($t, "$t^$_");
+ my $m = shift;
+ if ($fp && ($dbglevel{$l} || $l eq 'err')) {
+ foreach my $l (@_) {
+ for (my $o = 0; $o < length $l; $o += 16) {
+ my $c = substr $l, $o, 16;
+ my $h = unpack "H*", $c;
+ $c =~ s/[\x00-\x1f\x7f-\xff]/./g;
+ my $left = 16 - length $c;
+ $h .= ' ' x (2 * $left) if $left > 0;
+ dbg($m . sprintf("%4d:", $o) . "$h $c");
+ $m = ' ' x (length $m);
+ }
}
}
}
return keys (%dbglevel);
}
-sub isdbg
+sub isdbg($)
{
- my $s = shift;
- return $dbglevel{$s};
+ return unless $fp;
+ return $dbglevel{$_[0]};
}
sub shortmess
return Carp::longmess(@_);
}
+# clean out old debug files, stop when you get a gap of more than a month
+sub dbgclean
+{
+ my $date = $fp->unixtoj($main::systime)->sub($keepdays+1);
+ my $i = 0;
+
+ while ($i < 31) {
+ my $fn = $fp->_genfn($date);
+ if (-e $fn) {
+ unlink $fn;
+ $i = 0;
+ } else {
+ $i++;
+ }
+ $date = $date->sub(1);
+ }
+}
+
+sub dbglog
+{
+ my $sort = shift;
+ my $l = shift;
+ dbg($l);
+ DXLog::Log($sort, $l);
+}
1;
__END__