projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix spurious mojo close error on client
[spider.git]
/
perl
/
DXDebug.pm
diff --git
a/perl/DXDebug.pm
b/perl/DXDebug.pm
index 7640a2a1cd5d594607d77932a370379d23902128..dbeab595045870a1ee74e360ea5a5af5bf4f9aac 100644
(file)
--- a/
perl/DXDebug.pm
+++ b/
perl/DXDebug.pm
@@
-4,24
+4,27
@@
#
# Copyright (c) 1998 - Dirk Koopman G1TLH
#
#
# Copyright (c) 1998 - Dirk Koopman G1TLH
#
-#
$Id$
+#
#
package DXDebug;
require Exporter;
@ISA = qw(Exporter);
#
package DXDebug;
require Exporter;
@ISA = qw(Exporter);
-@EXPORT = qw(dbginit dbg
store dbg dbgadd dbgsub dbglist dbgdump isdbg dbgclose confess croak cluc
k cluck);
+@EXPORT = qw(dbginit dbg
dbgadd dbgsub dbglist dbgdump isdbg dbgclose confess croa
k cluck);
use strict;
use strict;
-use vars qw(%dbglevel $fp);
+use vars qw(%dbglevel $fp
$callback $cleandays $keepdays
);
use DXUtil;
use DXLog ();
use DXUtil;
use DXLog ();
-use Carp
qw(cluck
);
+use Carp
(
);
%dbglevel = ();
$fp = undef;
%dbglevel = ();
$fp = undef;
+$callback = undef;
+$keepdays = 10;
+$cleandays = 100;
# Avoid generating "subroutine redefined" warnings with the following
# hack (from CGI::Carp):
# Avoid generating "subroutine redefined" warnings with the following
# hack (from CGI::Carp):
@@
-29,47
+32,66
@@
if (!defined $DB::VERSION) {
local $^W=0;
eval qq( sub confess {
\$SIG{__DIE__} = 'DEFAULT';
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';
exit(-1);
}
sub croak {
\$SIG{__DIE__} = 'DEFAULT';
- DXDebug::dbgstore(\$@, Carp::longmess(\@_));
+ DXDebug::dbg(\$@);
+ DXDebug::dbg(Carp::longmess(\@_));
exit(-1);
}
exit(-1);
}
- sub carp { DXDebug::dbg
store
(Carp::shortmess(\@_)); }
- sub cluck { DXDebug::dbg
store
(Carp::longmess(\@_)); }
+ sub carp { DXDebug::dbg(Carp::shortmess(\@_)); }
+ sub cluck { DXDebug::dbg(Carp::longmess(\@_)); }
);
CORE::die(Carp::shortmess($@)) if $@;
} else {
);
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 dbg
store
+sub dbg
($)
{
{
+ return unless $fp;
my $t = time;
for (@_) {
my $r = $_;
chomp $r;
my @l = split /\n/, $r;
for (@l) {
my $t = time;
for (@_) {
my $r = $_;
chomp $r;
my @l = split /\n/, $r;
for (@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;
print "$_\n" if defined \*STDOUT;
- $fp->writeunix($t, "$t^$_");
+ my $str = "$t^$_";
+ &$callback($str) if $callback;
+ $fp->writeunix($t, $str);
}
}
}
sub dbginit
{
}
}
}
sub dbginit
{
+ $callback = shift;
+
# add sig{__DIE__} handling
if (!defined $DB::VERSION) {
# add sig{__DIE__} handling
if (!defined $DB::VERSION) {
- $SIG{__WARN__} = sub { dbgstore($@, Carp::shortmess(@_)); };
- $SIG{__DIE__} = sub { dbgstore($@, 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');
}
$fp = DXLog::new('debug', 'dat', 'd');
@@
-82,14
+104,6
@@
sub dbgclose
undef $fp;
}
undef $fp;
}
-sub dbg
-{
- my $l = shift;
- if ($fp && ($dbglevel{$l} || $l eq 'err')) {
- dbgstore(@_);
- }
-}
-
sub dbgdump
{
my $l = shift;
sub dbgdump
{
my $l = shift;
@@
-102,7
+116,7
@@
sub dbgdump
$c =~ s/[\x00-\x1f\x7f-\xff]/./g;
my $left = 16 - length $c;
$h .= ' ' x (2 * $left) if $left > 0;
$c =~ s/[\x00-\x1f\x7f-\xff]/./g;
my $left = 16 - length $c;
$h .= ' ' x (2 * $left) if $left > 0;
- dbg
store
($m . sprintf("%4d:", $o) . "$h $c");
+ dbg($m . sprintf("%4d:", $o) . "$h $c");
$m = ' ' x (length $m);
}
}
$m = ' ' x (length $m);
}
}
@@
-132,10
+146,10
@@
sub dbglist
return keys (%dbglevel);
}
return keys (%dbglevel);
}
-sub isdbg
+sub isdbg
($)
{
{
-
my $s = shift
;
- return $dbglevel{$
s
};
+
return unless $fp
;
+ return $dbglevel{$
_[0]
};
}
sub shortmess
}
sub shortmess
@@
-148,6
+162,24
@@
sub longmess
return Carp::longmess(@_);
}
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__
1;
__END__