X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FLXDebug.pm;h=6da1a72724cf690ccfc1cb10d8b6e45379f9d602;hb=4311578257aa2e5808580def7e80a38d493646b0;hp=c3a5a6485cc6faa0f729d9e613452b70087609f1;hpb=5d0421a3b1a61e80f69e181480c73b099cb98ad2;p=kivitendo-erp.git

diff --git a/SL/LXDebug.pm b/SL/LXDebug.pm
index c3a5a6485..6da1a7272 100644
--- a/SL/LXDebug.pm
+++ b/SL/LXDebug.pm
@@ -1,9 +1,13 @@
 package LXDebug;
 
-use constant NONE => 0;
-use constant INFO => 1;
-use constant DEBUG1 => 2;
-use constant DEBUG2 => 3;
+use constant NONE               => 0;
+use constant INFO               => 1;
+use constant DEBUG1             => 2;
+use constant DEBUG2             => 4;
+use constant QUERY              => 8;
+use constant TRACE              => 16;
+use constant BACKTRACE_ON_ERROR => 32;
+use constant ALL                => 63;
 
 use constant FILE_TARGET   => 0;
 use constant STDERR_TARGET => 1;
@@ -12,12 +16,15 @@ use POSIX qw(strftime);
 
 my $data_dumper_available;
 
+our $global_level;
+our $watch_form;
+
 BEGIN {
   eval("use Data::Dumper");
   $data_dumper_available = $@ ? 0 : 1;
 
   $global_level      = NONE;
-  $global_trace_subs = 0;
+  $watch_form        = 0;
 }
 
 sub new {
@@ -28,7 +35,6 @@ sub new {
   $self->{"file"}       = "/tmp/lx-office-debug.log";
   $self->{"target"}     = FILE_TARGET;
   $self->{"level"}      = 0;
-  $self->{"trace_subs"} = 0;
 
   while ($_[0]) {
     $self->{ $_[0] } = $_[1];
@@ -52,64 +58,67 @@ sub set_target {
 }
 
 sub enter_sub {
-  my ($self) = @_;
+  my ($self, $level) = @_;
+  $level *= 1;
 
-  if (!$self->{"trace_subs"} && !$global_trace_subs) {
-    return;
-  }
+  return 1 unless ($global_level & TRACE);          # ignore if traces aren't active
+  return 1 if $level && !($global_level & $level);  # ignore if level of trace isn't active
 
   my ($package, $filename, $line, $subroutine) = caller(1);
   my ($dummy1, $self_filename, $self_line) = caller(0);
 
-  my $indent = "  " x $self->{"calldepth"};
-  $self->{"calldepth"} += 1;
+  my $indent = " " x $self->{"calldepth"}++;
 
   if (!defined($package)) {
-    $self->_write("enter_sub", $indent . "top-level?\n");
+    $self->_write('sub' . $level, $indent . "\\ top-level?\n");
   } else {
-    $self->_write("enter_sub",
-                  $indent
-                    . "${subroutine} in "
+    $self->_write('sub' . $level, $indent
+                    . "\\ ${subroutine} in "
                     . "${self_filename}:${self_line} called from "
                     . "${filename}:${line}\n");
   }
+  return 1;
 }
 
 sub leave_sub {
-  my ($self) = @_;
+  my ($self, $level) = @_;
+  $level *= 1;
 
-  if (!$self->{"trace_subs"} && !$global_trace_subs) {
-    return;
-  }
+  return 1 unless ($global_level & TRACE);           # ignore if traces aren't active
+  return 1 if $level && !($global_level & $level);   # ignore if level of trace isn't active
 
   my ($package, $filename, $line, $subroutine) = caller(1);
   my ($dummy1, $self_filename, $self_line) = caller(0);
 
-  $self->{"calldepth"} -= 1;
-  my $indent = "  " x $self->{"calldepth"};
+  my $indent = " " x --$self->{"calldepth"};
 
   if (!defined($package)) {
-    $self->_write("leave_sub", $indent . "top-level?\n");
+    $self->_write('sub' . $level, $indent . "/ top-level?\n");
   } else {
-    $self->_write("leave_sub",
-            $indent . "${subroutine} in " . "${self_filename}:${self_line}\n");
+    $self->_write('sub' . $level, $indent . "/ ${subroutine} in " . "${self_filename}:${self_line}\n");
   }
+  return 1;
 }
 
-sub message {
-  my ($self, $level, $message) = @_;
-  my ($log_level) = $self->{"level"};
+sub show_backtrace {
+  my ($self) = @_;
 
-  if ($global_level && ($global_level > $log_level)) {
-    $log_level = $global_level;
-  }
+  return 1 unless ($global_level & BACKTRACE_ON_ERROR);
 
-  if ($log_level >= $level) {
-    $self->_write(INFO == $level
-                  ? "info"
-                  : DEBUG1 == $level ? "debug1" : "debug2",
-                  $message);
+  $self->message(BACKTRACE_ON_ERROR, "Starting full caller dump:");
+  my $level = 0;
+  while (my ($dummy, $filename, $line, $subroutine) = caller $level) {
+    $self->message(BACKTRACE_ON_ERROR, "  ${subroutine} from ${filename}:${line}");
+    $level++;
   }
+
+  return 1;
+}
+
+sub message {
+  my ($self, $level, $message) = @_;
+
+  $self->_write(level2string($level), $message) if (($self->{"level"} | $global_level) & $level || !$level);
 }
 
 sub dump {
@@ -126,12 +135,12 @@ sub dump {
 
 sub enable_sub_tracing {
   my ($self) = @_;
-  $self->{"trace_subs"} = 1;
+  $self->{level} | TRACE;
 }
 
 sub disable_sub_tracing {
   my ($self) = @_;
-  $self->{"trace_subs"} = 1;
+  $self->{level} & ~ TRACE;
 }
 
 sub _write {
@@ -146,9 +155,14 @@ sub _write {
     print(FILE "${date}${message}\n");
     close(FILE);
 
-      } elsif (STDERR_TARGET == $self->{"target"}) {
+  } elsif (STDERR_TARGET == $self->{"target"}) {
     print(STDERR "${date}${message}\n");
   }
 }
 
+sub level2string {
+  # use $_[0] as a bit mask and return levelstrings separated by /
+  join '/', qw(info debug1 debug2 query trace error_call_trace)[ grep { (reverse split //, sprintf "%05b", $_[0])[$_] } 0..5 ]
+}
+
 1;