use DXUtil;
use DXLog ();
-use Carp;
+use Carp qw(cluck);
%dbglevel = ();
$fp = DXLog::new('debug', 'dat', 'd');
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(\@_)); }
);
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^$_");
+ }
}
}
{
# 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(@_)); };
}
}