X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXDebug.pm;h=632602313238c659c416fdafb1a5cb8163833efa;hb=d9db74c1b2b9b57cb6d31e8c8c425f3636f62f87;hp=c03f92af8b18308c1c32d52bd8affeae59024377;hpb=cce161221036760959ff1d0b7628a55942bf558a;p=spider.git

diff --git a/perl/DXDebug.pm b/perl/DXDebug.pm
index c03f92af..63260231 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,17 +24,41 @@ use Carp;
 %dbglevel = ();
 $fp = DXLog::new('debug', 'dat', 'd');
 
+sub _store
+{
+	my $t = time; 
+	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^$_");
 		}
-		print "@_\n" if defined \*STDOUT;
-		my $t = time;
-		$fp->writeunix($t, "$t^@_");
 	}
 }