X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXDebug.pm;h=2cbdc2956e937b2e64fce2bf12354f271a37cdab;hb=95a03441d20680a914673d1b6bbf46c0d673ad4c;hp=77ad46396406d362e3de927b41ca1a45dadf2261;hpb=59e9f019432790d60afcbc96e490375e6a544dbc;p=spider.git

diff --git a/perl/DXDebug.pm b/perl/DXDebug.pm
index 77ad4639..2cbdc295 100644
--- a/perl/DXDebug.pm
+++ b/perl/DXDebug.pm
@@ -11,14 +11,14 @@ package DXDebug;
 
 require Exporter;
 @ISA = qw(Exporter);
-@EXPORT = qw(dbginit dbgstore dbg dbgadd dbgsub dbglist dbgdump isdbg dbgclose confess croak cluck cluck);
+@EXPORT = qw(dbginit dbgstore dbg dbgadd dbgsub dbglist dbgdump isdbg dbgclose confess croak cluck);
 
 use strict;
 use vars qw(%dbglevel $fp);
 
 use DXUtil;
 use DXLog ();
-use Carp qw(cluck);
+use Carp ();
 
 %dbglevel = ();
 $fp = undef;
@@ -43,8 +43,10 @@ if (!defined $DB::VERSION) {
 
     CORE::die(Carp::shortmess($@)) if $@;
 } else {
-    eval qq( sub confess { Carp::confess(\@_); }; 
-	sub cluck { Carp::cluck(\@_); }; 
+    eval qq( sub confess { die Carp::longmess(\@_); }; 
+			 sub croak { die Carp::shortmess(\@_); }; 
+			 sub cluck { warn Carp::longmess(\@_); }; 
+			 sub carp { warn Carp::shortmess(\@_); }; 
    );
 } 
 
@@ -53,13 +55,13 @@ sub dbgstore
 {
 	my $t = time; 
 	for (@_) {
-		chomp;
-		my @l = split /\n/;
+		my $r = $_;
+		chomp $r;
+		my @l = split /\n/, $r;
 		for (@l) {
-			my $l = $_;
-			$l =~ s/([\x00\x08\x0B-\x1f\x7f-\xff])/uc sprintf("%%%02x",ord($1))/eg;			
-			print "$l\n" if defined \*STDOUT;
-			$fp->writeunix($t, "$t^$l"); 
+			s/([\x00-\x08\x0B-\x1f\x7f-\xff])/uc sprintf("%%%02x",ord($1))/eg;
+			print "$_\n" if defined \*STDOUT;
+			$fp->writeunix($t, "$t^$_"); 
 		}
 	}
 }
@@ -68,7 +70,15 @@ sub dbginit
 {
 	# add sig{__DIE__} handling
 	if (!defined $DB::VERSION) {
-		$SIG{__WARN__} = sub { dbgstore($@, Carp::shortmess(@_)); };
+		$SIG{__WARN__} = sub { 
+			if ($_[0] =~ /Deep\s+recursion/i) {
+				dbgstore($@, Carp::longmess(@_)); 
+				CORE::die;
+			} else { 
+				dbgstore($@, Carp::shortmess(@_));
+			}
+		};
+		
 		$SIG{__DIE__} = sub { dbgstore($@, Carp::longmess(@_)); };
 	}