projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
subs für den customer und employee select angepasst; sowie get_lists
[kivitendo-erp.git]
/
SL
/
LXDebug.pm
diff --git
a/SL/LXDebug.pm
b/SL/LXDebug.pm
index
8a9619c
..
8a4dd29
100644
(file)
--- a/
SL/LXDebug.pm
+++ b/
SL/LXDebug.pm
@@
-3,7
+3,10
@@
package LXDebug;
use constant NONE => 0;
use constant INFO => 1;
use constant DEBUG1 => 2;
use constant NONE => 0;
use constant INFO => 1;
use constant DEBUG1 => 2;
-use constant DEBUG2 => 3;
+use constant DEBUG2 => 4;
+use constant QUERY => 8;
+use constant TRACE => 16;
+use constant ALL => 31;
use constant FILE_TARGET => 0;
use constant STDERR_TARGET => 1;
use constant FILE_TARGET => 0;
use constant STDERR_TARGET => 1;
@@
-12,12
+15,15
@@
use POSIX qw(strftime);
my $data_dumper_available;
my $data_dumper_available;
+our $global_level;
+our $watch_form;
+
BEGIN {
eval("use Data::Dumper");
$data_dumper_available = $@ ? 0 : 1;
$global_level = NONE;
BEGIN {
eval("use Data::Dumper");
$data_dumper_available = $@ ? 0 : 1;
$global_level = NONE;
- $
global_trace_subs
= 0;
+ $
watch_form
= 0;
}
sub new {
}
sub new {
@@
-28,7
+34,6
@@
sub new {
$self->{"file"} = "/tmp/lx-office-debug.log";
$self->{"target"} = FILE_TARGET;
$self->{"level"} = 0;
$self->{"file"} = "/tmp/lx-office-debug.log";
$self->{"target"} = FILE_TARGET;
$self->{"level"} = 0;
- $self->{"trace_subs"} = 0;
while ($_[0]) {
$self->{ $_[0] } = $_[1];
while ($_[0]) {
$self->{ $_[0] } = $_[1];
@@
-52,64
+57,52
@@
sub set_target {
}
sub enter_sub {
}
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 ($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)) {
if (!defined($package)) {
- $self->_write(
"enter_sub", $indent . "
top-level?\n");
+ $self->_write(
'sub' . $level, $indent . "\\
top-level?\n");
} else {
} else {
- $self->_write("enter_sub",
- $indent
- . "${subroutine} in "
+ $self->_write('sub' . $level, $indent
+ . "\\ ${subroutine} in "
. "${self_filename}:${self_line} called from "
. "${filename}:${line}\n");
}
. "${self_filename}:${self_line} called from "
. "${filename}:${line}\n");
}
+ return 1;
}
sub leave_sub {
}
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);
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)) {
if (!defined($package)) {
- $self->_write(
"leave_sub", $indent . "
top-level?\n");
+ $self->_write(
'sub' . $level, $indent . "/
top-level?\n");
} else {
} 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) = @_;
}
sub message {
my ($self, $level, $message) = @_;
- my ($log_level) = $self->{"level"};
- if ($global_level && ($global_level > $log_level)) {
- $log_level = $global_level;
- }
-
- if ($log_level >= $level) {
- $self->_write(INFO == $level
- ? "info"
- : DEBUG1 == $level ? "debug1" : "debug2",
- $message);
- }
+ $self->_write(level2string($level), $message) if (($self->{"level"} | $global_level) & $level || !$level);
}
sub dump {
}
sub dump {
@@
-126,12
+119,12
@@
sub dump {
sub enable_sub_tracing {
my ($self) = @_;
sub enable_sub_tracing {
my ($self) = @_;
- $self->{
"trace_subs"} = 1
;
+ $self->{
level} | TRACE
;
}
sub disable_sub_tracing {
my ($self) = @_;
}
sub disable_sub_tracing {
my ($self) = @_;
- $self->{
"trace_subs"} = 1
;
+ $self->{
level} & ~ TRACE
;
}
sub _write {
}
sub _write {
@@
-146,9
+139,14
@@
sub _write {
print(FILE "${date}${message}\n");
close(FILE);
print(FILE "${date}${message}\n");
close(FILE);
-
} elsif (STDERR_TARGET == $self->{"target"}) {
+ } elsif (STDERR_TARGET == $self->{"target"}) {
print(STDERR "${date}${message}\n");
}
}
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)[ grep { (reverse split //, sprintf "%05b", $_[0])[$_] } 0..4 ]
+}
+
1;
1;