Recommit von r993:995 von udo_spallek: Weiteren Debuglevel hinzugefuegt: LXDebug...

[kivitendo-erp.git] / SL / LXDebug.pm

diff --git a/SL/LXDebug.pm b/SL/LXDebug.pm
index 8a9619c..10536c0 100644 (file)
--- a/SL/LXDebug.pm
+++ b/SL/LXDebug.pm
@@ -4,6 +4,7 @@ use constant NONE   => 0;
 use constant INFO   => 1;
 use constant DEBUG1 => 2;
 use constant DEBUG2 => 3;
+use constant QUERY  => 4;
 
 use constant FILE_TARGET   => 0;
 use constant STDERR_TARGET => 1;
@@ -52,48 +53,52 @@ sub set_target {
 }
 
 sub enter_sub {
-  my ($self) = @_;
+  my ($self, $level) = @_;
+
+  return 1 if $global_trace_subs < $level;
 
   if (!$self->{"trace_subs"} && !$global_trace_subs) {
-    return;
+    return 1;
   }
 
   my ($package, $filename, $line, $subroutine) = caller(1);
   my ($dummy1, $self_filename, $self_line) = caller(0);
 
-  my $indent = "  " x $self->{"calldepth"};
+  my $indent = " " x $self->{"calldepth"};
   $self->{"calldepth"} += 1;
 
   if (!defined($package)) {
-    $self->_write("enter_sub", $indent . "top-level?\n");
+    $self->_write('sub', $indent . "\\ top-level?\n");
   } else {
-    $self->_write("enter_sub",
-                  $indent
-                    . "${subroutine} in "
+    $self->_write('sub', $indent
+                    . "\\ ${subroutine} in "
                     . "${self_filename}:${self_line} called from "
                     . "${filename}:${line}\n");
   }
+  return 1;
 }
 
 sub leave_sub {
-  my ($self) = @_;
+  my ($self, $level) = @_;
+
+  return 1 if $global_trace_subs < $level;
 
   if (!$self->{"trace_subs"} && !$global_trace_subs) {
-    return;
+    return 1;
   }
 
   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', $indent . "/ top-level?\n");
   } else {
-    $self->_write("leave_sub",
-            $indent . "${subroutine} in " . "${self_filename}:${self_line}\n");
+    $self->_write('sub', $indent . "/ ${subroutine} in " . "${self_filename}:${self_line}\n");
   }
+  return 1;
 }
 
 sub message {
@@ -105,10 +110,11 @@ sub message {
   }
 
   if ($log_level >= $level) {
-    $self->_write(INFO == $level
-                  ? "info"
-                  : DEBUG1 == $level ? "debug1" : "debug2",
-                  $message);
+    $self->_write(INFO   == $level ? "info"
+                : DEBUG1 == $level ? "debug1" 
+                : DEBUG2 == $level ? "debug2"
+                : QUERY  == $level ? "query":"",
+                $message );
   }
 }
 
@@ -131,7 +137,7 @@ sub enable_sub_tracing {
 
 sub disable_sub_tracing {
   my ($self) = @_;
-  $self->{"trace_subs"} = 1;
+  $self->{"trace_subs"} = 0;
 }
 
 sub _write {