diff options
| author | Andreas Brachold <vdr07@deltab.de> | 2007-11-09 13:52:41 +0000 |
|---|---|---|
| committer | Andreas Brachold <vdr07@deltab.de> | 2007-11-09 13:52:41 +0000 |
| commit | c66187b33b7cbbd88697167a583154372705e119 (patch) | |
| tree | b552b1c46dfbb5dbd10d6f6b765164daf6fddfce /lib/Tools.pm | |
| parent | 5a05c75078cd3dc8e6eb0ac9cb5e6548c3c8fe9f (diff) | |
| download | xxv-c66187b33b7cbbd88697167a583154372705e119.tar.gz xxv-c66187b33b7cbbd88697167a583154372705e119.tar.bz2 | |
* LOG: Fix missing dump caller's modul name
Diffstat (limited to 'lib/Tools.pm')
| -rw-r--r-- | lib/Tools.pm | 45 |
1 files changed, 22 insertions, 23 deletions
diff --git a/lib/Tools.pm b/lib/Tools.pm index 8830ef8..d73c920 100644 --- a/lib/Tools.pm +++ b/lib/Tools.pm @@ -97,55 +97,54 @@ sub stackTrace { } # ------------------ -sub lg { +sub _msg { # ------------------ + my $errcode = shift; my $msg = shift; my $lev = shift || 5; - my $deep = shift || 1; - - return 1 if($VERBOSE < $lev); - $msg = 'ERR:202 ' . $msg - unless($msg =~ /^ERR:\d{3}/); + return if($VERBOSE < $lev); if($VERBOSE > 5 or $DUMPSTACK) { my ($stack, $evalon) = &stackTrace; $msg .= $stack if($evalon != 1); } - my ($package, $filename, $line, $subroutine) = caller($deep); + my ($package, $filename, $line, $subroutine) = caller(2); my $module = ''; $module = (split('::', $package))[-1] if($package); - &{$LOG}($module . ': ' . $msg); - - return 1; + &{$LOG}($errcode, $module . ': ' . $msg); } # ------------------ -sub event { +sub lg { # ------------------ my $msg = shift; - - my ($package, $filename, $line, $subroutine) = caller(3); - - &lg('EVT:270 ' . $msg, 3, 2); - - &{$LOGCALLB}($module, $subroutine, $msg); - - return 1; + &_msg(200,$msg, 5); + return undef; } # ------------------ sub debug { # ------------------ my $msg = shift; + &_msg(250,$msg, 3); + return undef; +} - &lg('ERR:250 ' . $msg, 2, 2); +# ------------------ +sub event { +# ------------------ + my $msg = shift; - return 1; + my ($package, $filename, $line, $subroutine) = caller(1); + &{$LOGCALLB}($module, $subroutine, $msg); + + &_msg(270,$msg, 2); + return undef; } # ------------------ @@ -153,7 +152,7 @@ sub error { # ------------------ my $msg = shift; - &lg('ERR:501 ' . $msg, 1, 2); + &_msg(501,$msg, 1); return undef; } @@ -163,7 +162,7 @@ sub panic { # ------------------ my $msg = shift; - &lg('ERR:550 ' . $msg, 1, 2); + &_msg(550,$msg, 0); return undef; } |
