X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXDebug.pm;h=80ef17ef3336f6fb9fb9bb8407a8649ae7b79696;hb=0c5379f083db3c338a848004ebe2168638c605e9;hp=c44ba35920f5d049291a4021b78b845c1406a606;hpb=5ff2fd1ff97212e4e490107d69f25572b71d2409;p=spider.git

diff --git a/perl/DXDebug.pm b/perl/DXDebug.pm
index c44ba359..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 dbgclose);
-@EXPORT_OK = qw(dbg dbgadd dbgsub dbglist isdbg dbgclose);
+@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,15 +24,23 @@ use Carp;
 %dbglevel = ();
 $fp = DXLog::new('debug', 'dat', 'd');
 
-# add sig{__DIE__} handling
-if (!defined $DB::VERSION) {
-	$SIG{__WARN__} = $SIG{__DIE__} = sub { 
-		my $t = time; 
-		for (@_) {
-			$fp->writeunix($t, "$t^$_"); 
-#			print STDERR $_;
-		}
-	};
+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