#
# Copyright (c) 1998 - Dirk Koopman G1TLH
#
-# $Id$
+#
#
package DXDebug;
require Exporter;
@ISA = qw(Exporter);
-@EXPORT = qw(dbginit dbgstore dbg dbgadd dbgsub dbglist dbgdump isdbg dbgclose confess croak cluck cluck);
+@EXPORT = qw(dbginit dbg dbgadd dbgsub dbglist dbgdump 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 ();
+use POSIX qw(isatty);
%dbglevel = ();
$fp = undef;
+$callback = undef;
+$keepdays = 10;
+$cleandays = 100;
+
+our $no_stdout; # set if not running in a terminal
# Avoid generating "subroutine redefined" warnings with the following
# hack (from CGI::Carp):
local $^W=0;
eval qq( sub confess {
\$SIG{__DIE__} = 'DEFAULT';
- DXDebug::dbgstore(\$@, Carp::shortmess(\@_));
+ DXDebug::dbg(\$@);
+ DXDebug::dbg(Carp::shortmess(\@_));
exit(-1);
}
sub croak {
\$SIG{__DIE__} = 'DEFAULT';
- DXDebug::dbgstore(\$@, Carp::longmess(\@_));
+ DXDebug::dbg(\$@);
+ DXDebug::dbg(Carp::longmess(\@_));
exit(-1);
}
- sub carp { DXDebug::dbgstore(Carp::shortmess(\@_)); }
- sub cluck { DXDebug::dbgstore(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 dbgstore
+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;
- print "$l\n" if defined \*STDOUT;
- $fp->writeunix($t, "$t^$l");
+ s/([\x00-\x08\x0B-\x1f\x7f-\xff])/uc sprintf("%%%02x",ord($1))/eg;
+ print "$_\n" if defined \*STDOUT && !$no_stdout;
+ 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 { dbgstore($@, Carp::shortmess(@_)); };
- $SIG{__DIE__} = sub { dbgstore($@, Carp::longmess(@_)); };
+ unless (defined $DB::VERSION) {
+ $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(@_)); };
+
+ # switch off STDOUT printing if we are not talking to a TTY
+ unless ($^O =~ /^MS/ || $^O =~ /^OS-2/) {
+ unless (isatty(STDOUT->fileno)) {
+ ++$no_stdout;
+ }
+ }
}
$fp = DXLog::new('debug', 'dat', 'd');
undef $fp;
}
-sub dbg
-{
- my $l = shift;
- if ($fp && ($dbglevel{$l} || $l eq 'err')) {
- dbgstore(@_);
- }
-}
-
sub dbgdump
{
+ return unless $fp;
+
my $l = shift;
my $m = shift;
- if ($fp && ($dbglevel{$l} || $l eq 'err')) {
+ if ($dbglevel{$l} || $l eq 'err') {
foreach my $l (@_) {
for (my $o = 0; $o < length $l; $o += 16) {
my $c = substr $l, $o, 16;
$c =~ s/[\x00-\x1f\x7f-\xff]/./g;
my $left = 16 - length $c;
$h .= ' ' x (2 * $left) if $left > 0;
- dbgstore($m . sprintf("%4d:", $o) . "$h $c");
+ 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);
+ }
+}
+
1;
__END__