* LOG: Fix missing dump caller's modul name

2 files changed, 28 insertions, 30 deletions

diff --git a/bin/xxvd b/bin/xxvd
index 6638854..a4dbc41 100755
--- a/bin/xxvd
+++ b/bin/xxvd
@@ -287,11 +287,11 @@ sub init {
             -dbh    => $DBH,
             -paths  => $PATHS,
         );
-        debug sprintf("Load modul %s(%s)\n",
+        debug sprintf("Load modul %s(%s)",
             $moduleName,
             (ref $MODULES->{$moduleName})
                 ? $MODULES->{$moduleName}->{MOD}->{Version}
-                : 'Problem!');
+                : 'failed');
 
     }
     &after();
@@ -659,11 +659,10 @@ sub init_logging {
 
     # This will add a callback for log output
     $Tools::LOG = sub{
+        my $errcode = shift;
         my $msg = shift;
-
-        my ($errcode, $txt) = $msg =~ /ERR:(\d{3})\s+(.*)/si;
-        $errcode = 201 if(!$errcode);
-        chomp($txt);
+        chomp($msg);
+        $errcode = 200 if(!$errcode);
 
         my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) =
             localtime(time);
@@ -671,7 +670,7 @@ sub init_logging {
             $year+1900, $mon+1,$mday,  $hour, $min, $sec );
 
         open(LOGGER, ">>", $loggerfile) or return;
-        print LOGGER sprintf("%d (%d) [%s] %s\n",++$loggercnt, $errcode, $tt, $txt);
+        print LOGGER sprintf("%d (%d) [%s] %s\n",++$loggercnt, $errcode, $tt, $msg);
         close LOGGER;
     };
 }
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;
 }