X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXDebug.pm;h=80ef17ef3336f6fb9fb9bb8407a8649ae7b79696;hb=1040e3d1a4f69bb3c197e2892129343520d34383;hp=611df54775060f011de4ee0423c853d7126bc1c7;hpb=50bafbfa099ff0847beeb30e41bc62a361ef0536;p=spider.git

diff --git a/perl/DXDebug.pm b/perl/DXDebug.pm
index 611df547..80ef17ef 100644
--- a/perl/DXDebug.pm
+++ b/perl/DXDebug.pm
@@ -11,13 +11,12 @@ 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);
+@EXPORT_OK = qw(dbginit dbg dbgadd dbgsub dbglist isdbg dbgclose);
 
 use strict;
 use vars qw(%dbglevel $fp);
 
-use FileHandle;
 use DXUtil;
 use DXLog ();
 use Carp;
@@ -25,18 +24,43 @@ use Carp;
 %dbglevel = ();
 $fp = DXLog::new('debug', 'dat', 'd');
 
-no strict 'refs';
+sub _store
+{
+	my $t = time; 
+	$fp->writeunix($t, "$t^$@") if $@; 
+	$fp->writeunix($t, "$t^$!") if $!; 
+	for (@_) {
+		$fp->writeunix($t, "$t^$_"); 
+		print STDERR $_;
+	}
+}
+
+sub dbginit
+{
+	# add sig{__DIE__} handling
+	if (!defined $DB::VERSION) {
+		$SIG{__WARN__} = $SIG{__DIE__} = \&_store;
+	}
+}
+
+sub dbgclose
+{
+	$SIG{__DIE__} = $SIG{__WARN__} = 'DEFAULT';
+	$fp->close();
+}
 
 sub dbg
 {
 	my $l = shift;
 	if ($dbglevel{$l}) {
-		for (@_) {
-			s/\n$//og;
+	    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 +78,7 @@ sub dbgsub
 	my $entry;
 	
 	foreach $entry (@_) {
-		delete $dbglevel{entry};
+		delete $dbglevel{$entry};
 	}
 }
 
@@ -65,7 +89,8 @@ sub dbglist
 
 sub isdbg
 {
-	return $dbglevel{shift};
+	my $s = shift;
+	return $dbglevel{$s};
 }
 1;
 __END__