projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
incoming now working
[spider.git]
/
perl
/
DXDebug.pm
diff --git
a/perl/DXDebug.pm
b/perl/DXDebug.pm
index b42db66dfb4934dd9744b2f9c6fcd00f1b77e8be..b55d01fcf5ea8de4fa060321e12195468274d8cc 100644
(file)
--- a/
perl/DXDebug.pm
+++ b/
perl/DXDebug.pm
@@
-18,23
+18,23
@@
use vars qw(%dbglevel $fp);
use DXUtil;
use DXLog ();
use DXUtil;
use DXLog ();
-use Carp;
+use Carp
qw(cluck)
;
%dbglevel = ();
%dbglevel = ();
-$fp =
DXLog::new('debug', 'dat', 'd')
;
+$fp =
undef
;
# Avoid generating "subroutine redefined" warnings with the following
# hack (from CGI::Carp):
if (!defined $DB::VERSION) {
local $^W=0;
eval qq( sub confess {
# Avoid generating "subroutine redefined" warnings with the following
# hack (from CGI::Carp):
if (!defined $DB::VERSION) {
local $^W=0;
eval qq( sub confess {
- \$SIG{__DIE__} = 'DEFAULT';
- DXDebug::_store(Carp::longmess(\@_));
- exit(-1);
+
\$SIG{__DIE__} = 'DEFAULT';
+ DXDebug::_store(\$@, Carp::shortmess(\@_));
+
exit(-1);
}
}
- sub c
onfess
{
+ sub c
roak
{
\$SIG{__DIE__} = 'DEFAULT';
\$SIG{__DIE__} = 'DEFAULT';
- DXDebug::_store(Carp::shortmess(\@_));
+ DXDebug::_store(\$@, Carp::longmess(\@_));
exit(-1);
}
sub carp { DXDebug::_store(Carp::shortmess(\@_)); }
exit(-1);
}
sub carp { DXDebug::_store(Carp::shortmess(\@_)); }
@@
-42,15
+42,25
@@
if (!defined $DB::VERSION) {
);
CORE::die(Carp::shortmess($@)) if $@;
);
CORE::die(Carp::shortmess($@)) if $@;
-}
+} else {
+ eval qq( sub confess { Carp::confess(\@_); };
+ sub cluck { Carp::cluck(\@_); };
+ );
+}
sub _store
{
my $t = time;
for (@_) {
sub _store
{
my $t = time;
for (@_) {
- $fp->writeunix($t, "$t^$_");
- print STDERR $_;
+ chomp;
+ my @l = split /\n/;
+ for (@l) {
+ my $l = $_;
+ $l =~ s/([\x00\x08\x0B-\x1f\x7f-\xff])/uc sprintf("%%%02x",ord($1))/eg;
+ print "$_\n" if defined \*STDOUT;
+ $fp->writeunix($t, "$t^$_");
+ }
}
}
}
}
@@
-58,21
+68,24
@@
sub dbginit
{
# add sig{__DIE__} handling
if (!defined $DB::VERSION) {
{
# add sig{__DIE__} handling
if (!defined $DB::VERSION) {
- $SIG{__WARN__} = sub { _store(Carp::shortmess(@_)); };
- $SIG{__DIE__} = sub { _store(
Carp::short
mess(@_)); };
+ $SIG{__WARN__} = sub { _store(
$@,
Carp::shortmess(@_)); };
+ $SIG{__DIE__} = sub { _store(
$@, Carp::long
mess(@_)); };
}
}
+
+ $fp = DXLog::new('debug', 'dat', 'd');
}
sub dbgclose
{
$SIG{__DIE__} = $SIG{__WARN__} = 'DEFAULT';
}
sub dbgclose
{
$SIG{__DIE__} = $SIG{__WARN__} = 'DEFAULT';
- $fp->close();
+ $fp->close() if $fp;
+ undef $fp;
}
sub dbg
{
my $l = shift;
}
sub dbg
{
my $l = shift;
- if ($
dbglevel{$l} || $l eq 'err'
) {
+ if ($
fp && ($dbglevel{$l} || $l eq 'err')
) {
my @in = @_;
my $t = time;
for (@in) {
my @in = @_;
my $t = time;
for (@in) {