more information at several debug postitions

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@9992 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/gosa-si/modules/SIPackages.pm b/gosa-si/modules/SIPackages.pm
index 265b72416811b3e02254709ee2649e8b73710a31..4f7bd8611dedec2cd1dae64768424fa369a409f7 100644 (file)
--- a/gosa-si/modules/SIPackages.pm
+++ b/gosa-si/modules/SIPackages.pm
@@ -844,20 +844,20 @@ sub hardware_config {
        # check hit
        my $hit_counter = keys %{$res};
        if( not $hit_counter == 1 ) {
-               &main::daemon_log("ERROR: more or no hit found in known_clients_db by query by '$address'", 1);
+               &main::daemon_log("$session_id ERROR: more or no hit found in known_clients_db by query by '$address'", 1);
        }
        my $macaddress = $res->{1}->{macaddress};
        my $hostkey = $res->{1}->{hostkey};
 
        if (not defined $macaddress) {
-               &main::daemon_log("ERROR: no mac address found for client $address", 1);
+               &main::daemon_log("$session_id ERROR: no mac address found for client $address", 1);
                return;
        }
 
        # Build LDAP connection
     my $ldap_handle = &main::get_ldap_handle($session_id);
        if( not defined $ldap_handle ) {
-               &main::daemon_log("ERROR: cannot connect to ldap: $ldap_uri", 1);
+               &main::daemon_log("$session_id ERROR: cannot connect to ldap: $ldap_uri", 1);
                return;
        } 
 

diff --git a/gosa-si/server/events/gosaTriggered.pm b/gosa-si/server/events/gosaTriggered.pm
index b95f0d5c955a6693266fbe95938cedb57da61b7e..30f9464243534e05a2f606df350a7e6f093cacf5 100644 (file)
--- a/gosa-si/server/events/gosaTriggered.pm
+++ b/gosa-si/server/events/gosaTriggered.pm
@@ -75,12 +75,12 @@ sub send_user_msg {
 
     # error handling
     if( not @user_list && not @group_list ) {
-        &main::daemon_log("WARNING: no user-tag or a group-tag specified in 'send_user_msg'", 3); 
+        &main::daemon_log("$session_id WARNING: no user-tag or a group-tag specified in 'send_user_msg'", 3); 
         return ("<xml><header>$header</header><source>GOSA</source><target>GOSA</target>".
                 "<error_string>no user-tag or a group-tag specified in 'send_user_msg'</error_string></xml>");
     }
     if( not defined $message ) {
-        &main::daemon_log("WARNING: no message-tag specified in 'send_user_msg'", 3); 
+        &main::daemon_log("$session_id WARNING: no message-tag specified in 'send_user_msg'", 3); 
         return ("<xml><header>$header</header><source>GOSA</source><target>GOSA</target>".
                 "<error_string>no message-tag specified in 'send_user_msg'</error_string></xml>");
 
@@ -91,7 +91,7 @@ sub send_user_msg {
     if( @group_list ) {
         # build ldap connection
         if( not defined $ldap_handle ) {
-            &main::daemon_log("ERROR: cannot connect to ldap", 1);
+            &main::daemon_log("$session_id ERROR: cannot connect to ldap", 1);
             return ();
         } 
         foreach my $group (@group_list) {

diff --git a/gosa-si/server/events/siTriggered.pm b/gosa-si/server/events/siTriggered.pm
index 104cd8f1fbf1d9f9e1299c96f45ceba2b5488e80..9050d554bc75fec9d00512a64dd3db4805c9f98b 100644 (file)
--- a/gosa-si/server/events/siTriggered.pm
+++ b/gosa-si/server/events/siTriggered.pm
@@ -129,7 +129,7 @@ sub detected_hardware {
        # check hit
        my $hit_counter = keys %{$res};
        if( not $hit_counter == 1 ) {
-               &main::daemon_log("ERROR: more or no hit found in known_clients_db by query by '$address'", 1);
+               &main::daemon_log("$session_id ERROR: more or no hit found in known_clients_db by query by '$address'", 1);
                return;
        }
 
@@ -137,13 +137,13 @@ sub detected_hardware {
        my $hostkey = $res->{1}->{hostkey};
 
        if (not defined $macaddress) {
-               &main::daemon_log("ERROR: no mac address found for client $address", 1);
+               &main::daemon_log("$session_id ERROR: no mac address found for client $address", 1);
                return;
        }
        # Build LDAP connection
     my $ldap_handle = &main::get_ldap_handle($session_id);
        if( not defined $ldap_handle ) {
-               &main::daemon_log("ERROR: cannot connect to ldap: $ldap_uri", 1);
+               &main::daemon_log("$session_id ERROR: cannot connect to ldap: $ldap_uri", 1)
                return;
        }