From: rettenbe <rettenbe@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Tue, 15 Apr 2008 08:59:26 +0000 (+0000)
Subject: add session_id at logging for event recreate_fai_release_db
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=603a9e60bceaa4c29cc3b05a96c5e587b1366774;p=gosa.git

add session_id at logging for event recreate_fai_release_db


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

diff --git a/gosa-si/gosa-si-server b/gosa-si/gosa-si-server
index 8a69ca418..9bd722dca 100755
--- a/gosa-si/gosa-si-server
+++ b/gosa-si/gosa-si-server
@@ -1656,12 +1656,15 @@ sub run_create_fai_server_db {
 
 
 sub create_fai_release_db {
-	my ($table_name) = @_;
+	my ($table_name, $session_id) = @_;
 	my $result;
 
+    # used for logging
+    if (not defined $session_id) { $session_id = "0"; }
+
     my $ldap_handle = &get_ldap_handle();
 	if(defined($ldap_handle)) {
-		daemon_log("INFO: create_fai_release_db: start",5);
+		daemon_log("$session_id INFO: create_fai_release_db: start",5);
 		my $mesg= $ldap_handle->search(
 			base   => $ldap_base,
 			scope  => 'sub',
@@ -1694,14 +1697,14 @@ sub create_fai_release_db {
 					}
 				}
 			}
-			daemon_log("DEBUG: Inserting ".scalar @sql_list." entries to DB",6);
+			daemon_log("$session_id DEBUG: Inserting ".scalar @sql_list." entries to DB",6);
 			if(@sql_list) {
 				unshift @sql_list, "DELETE FROM $table_name";
 				$fai_server_db->exec_statementlist(\@sql_list);
 			}
-			daemon_log("DEBUG: Done with inserting",6);
+			daemon_log("$session_id DEBUG: Done with inserting",6);
 		}
-		daemon_log("INFO: create_fai_release_db: finished",5);
+		daemon_log("$session_id INFO: create_fai_release_db: finished",5);
 	}
     $ldap_handle->disconnect;
 	return $result;
diff --git a/gosa-si/server/events/gosaTriggered.pm b/gosa-si/server/events/gosaTriggered.pm
index d1c1cdf9e..80f793e8d 100644
--- a/gosa-si/server/events/gosaTriggered.pm
+++ b/gosa-si/server/events/gosaTriggered.pm
@@ -226,7 +226,7 @@ sub recreate_fai_release_db {
     }
 
     $main::fai_server_db->create_table("new_fai_release", \@main::fai_release_col_names);
-    &main::create_fai_release_db("new_fai_release");
+    &main::create_fai_release_db("new_fai_release", $session_id);
     $main::fai_server_db->move_table("new_fai_release", $main::fai_release_tn);
 
     my @out_msg_l = ( $out_msg );
diff --git a/gosa-si/tests/client.php b/gosa-si/tests/client.php
index b3e63b2ac..7609df6a9 100755
--- a/gosa-si/tests/client.php
+++ b/gosa-si/tests/client.php
@@ -53,7 +53,6 @@ if($sock->connected()){
 #$data = "<xml> <header>job_set_activated_for_installation</header> <target>10.89.1.31:20083</target> <source>GOSA</source> <macaddress>00:01:6c:9d:b9:fa</macaddress><timestamp>22220101000000</timestamp></xml>";
 
 
-
 # trigger jobs at client
 #$data = "<xml> <header>gosa_detect_hardware</header> <target>10.89.1.31:20083</target> <source>10.89.1.31:20081</source> </xml>";
 #$data = "<xml> <header>gosa_new_key_for_client</header> <target>00:01:6c:9d:b9:fa</target> <source>10.89.1.31:20081</source> </xml>";
@@ -73,13 +72,14 @@ if($sock->connected()){
 
 # recreate_fai_server_db
 #$data = "<xml> <header>gosa_recreate_fai_server_db</header> <target>GOSA</target> <source>GOSA</source></xml>"; 
+$data = "<xml> <header>gosa_recreate_fai_release_db</header> <target>GOSA</target> <source>GOSA</source></xml>"; 
 
 ###########
 # messaging 
 #$data = "<xml> <header>gosa_send_user_msg</header> <target>GOSA</target> <source>GOSA</source> <user>susi</user> <user>harald</user> <user>susi</user> <group>gosa-admins-all</group> </xml>"; 
 #$data = "<xml> <header>gosa_send_user_msg</header> <target>GOSA</target> <source>GOSA</source> <group>gosa-admins-all</group> <usrmesg>kaffeepause</usrmesg> </xml>"; 
 #$data = "<xml> <header>gosa_send_user_msg</header> <target>GOSA</target> <source>GOSA</source> <user>rettenbe</user> <message>kaffeepause</message> </xml>"; 
-$data = "<xml> <header>gosa_send_user_msg</header> <target>GOSA</target> <source>GOSA</source> <subject>eine wichtige nachricht</subject> <from>me</from> <to>you</to> <delivery_time>20130101235959</delivery_time> <message>kaffeepause</message> </xml>"; 
+#$data = "<xml> <header>gosa_send_user_msg</header> <target>GOSA</target> <source>GOSA</source> <subject>eine wichtige nachricht</subject> <from>me</from> <to>you</to> <delivery_time>20130101235959</delivery_time> <message>kaffeepause</message> </xml>"; 
 
 
 ################
@@ -97,7 +97,6 @@ $data = "<xml> <header>gosa_send_user_msg</header> <target>GOSA</target> <source
 #$data = "<xml> <header>gosa_get_log_file_by_date_and_mac</header> <target>GOSA</target> <source>GOSA</source> <date>install_20080311_090900</date> <mac>00:01:6c:9d:b9:fa</mac> <log_file>boot.log</log_file></xml>"; 
 
 
-
     $sock->write($data);
     $answer = "nothing";
 	$answer = $sock->read();