get all the debugging finally into the debug files when things go wrong

[spider.git] / perl / DXDebug.pm

diff --git a/perl/DXDebug.pm b/perl/DXDebug.pm
index 611df54775060f011de4ee0423c853d7126bc1c7..b42db66dfb4934dd9744b2f9c6fcd00f1b77e8be 100644 (file)
--- a/perl/DXDebug.pm
+++ b/perl/DXDebug.pm
@@ -11,13 +11,11 @@ package DXDebug;
 
 require Exporter;
 @ISA = qw(Exporter);
-@EXPORT = qw(dbg dbgadd dbgsub dbglist isdbg);
-@EXPORT_OK = qw(dbg dbgadd dbgsub dbglist isdbg);
+@EXPORT = qw(dbginit dbg dbgadd dbgsub dbglist isdbg dbgclose confess croak cluck cluck);
 
 use strict;
 use vars qw(%dbglevel $fp);
 
-use FileHandle;
 use DXUtil;
 use DXLog ();
 use Carp;
@@ -25,18 +23,64 @@ use Carp;
 %dbglevel = ();
 $fp = DXLog::new('debug', 'dat', 'd');
 
-no strict 'refs';
+# 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); 
+       }
+       sub confess { 
+               \$SIG{__DIE__} = 'DEFAULT'; 
+               DXDebug::_store(Carp::shortmess(\@_)); 
+               exit(-1); 
+       }
+       sub carp    { DXDebug::_store(Carp::shortmess(\@_)); }
+       sub cluck   { DXDebug::_store(Carp::longmess(\@_)); } 
+       );
+
+    CORE::die(Carp::shortmess($@)) if $@;
+}
+
+
+sub _store
+{
+       my $t = time; 
+       for (@_) {
+               $fp->writeunix($t, "$t^$_"); 
+               print STDERR $_;
+       }
+}
+
+sub dbginit
+{
+       # add sig{__DIE__} handling
+       if (!defined $DB::VERSION) {
+               $SIG{__WARN__} = sub { _store(Carp::shortmess(@_)); };
+               $SIG{__DIE__} = sub { _store(Carp::shortmess(@_)); };
+       }
+}
+
+sub dbgclose
+{
+       $SIG{__DIE__} = $SIG{__WARN__} = 'DEFAULT';
+       $fp->close();
+}
 
 sub dbg
 {
        my $l = shift;
-       if ($dbglevel{$l}) {
-               for (@_) {
-                       s/\n$//og;
+       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 $str = atime . "@_" ;
-               print "$str\n";
-               $fp->writenow($str);
        }
 }
 
@@ -54,7 +98,7 @@ sub dbgsub
        my $entry;
        
        foreach $entry (@_) {
-               delete $dbglevel{entry};
+               delete $dbglevel{$entry};
        }
 }
 
@@ -65,7 +109,26 @@ sub dbglist
 
 sub isdbg
 {
-       return $dbglevel{shift};
+       my $s = shift;
+       return $dbglevel{$s};
+}
+
+sub shortmess 
+{
+       return Carp::shortmess(@_);
 }
+
+sub longmess 
+{ 
+       return Carp::longmess(@_);
+}
+
 1;
 __END__
+
+
+
+
+
+
+