X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXDebug.pm;h=b55d01fcf5ea8de4fa060321e12195468274d8cc;hb=076b94b8ba5b24af929056d5e4c5217427f93b9e;hp=b42db66dfb4934dd9744b2f9c6fcd00f1b77e8be;hpb=0bd9d2811cc42417676a1b11b121681c2377d70a;p=spider.git

diff --git a/perl/DXDebug.pm b/perl/DXDebug.pm
index b42db66d..b55d01fc 100644
--- a/perl/DXDebug.pm
+++ b/perl/DXDebug.pm
@@ -18,23 +18,23 @@ use vars qw(%dbglevel $fp);
 
 use DXUtil;
 use DXLog ();
-use Carp;
+use Carp qw(cluck);
 
 %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 { 
-	   \$SIG{__DIE__} = 'DEFAULT'; 
-	   DXDebug::_store(Carp::longmess(\@_)); 
-	   exit(-1); 
+	    \$SIG{__DIE__} = 'DEFAULT'; 
+        DXDebug::_store(\$@, Carp::shortmess(\@_));
+	    exit(-1); 
 	}
-	sub confess { 
+	sub croak { 
 		\$SIG{__DIE__} = 'DEFAULT'; 
-		DXDebug::_store(Carp::shortmess(\@_)); 
+        DXDebug::_store(\$@, Carp::longmess(\@_));
 		exit(-1); 
 	}
 	sub carp    { DXDebug::_store(Carp::shortmess(\@_)); }
@@ -42,15 +42,25 @@ if (!defined $DB::VERSION) {
 	);
 
     CORE::die(Carp::shortmess($@)) if $@;
-}
+} else {
+    eval qq( sub confess { Carp::confess(\@_); }; 
+	sub cluck { Carp::cluck(\@_); }; 
+   );
+} 
 
 
 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) {
-		$SIG{__WARN__} = sub { _store(Carp::shortmess(@_)); };
-		$SIG{__DIE__} = sub { _store(Carp::shortmess(@_)); };
+		$SIG{__WARN__} = sub { _store($@, Carp::shortmess(@_)); };
+		$SIG{__DIE__} = sub { _store($@, Carp::longmess(@_)); };
 	}
+
+	$fp = DXLog::new('debug', 'dat', 'd');
 }
 
 sub dbgclose
 {
 	$SIG{__DIE__} = $SIG{__WARN__} = 'DEFAULT';
-	$fp->close();
+	$fp->close() if $fp;
+	undef $fp;
 }
 
 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) {