X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-si%2Fgosa-si-server;h=048089fbf0e3e28bda4d364b5494c04c3f525883;hb=ed91e18dc0bb59b019f2930b96bf47417a49289e;hp=8a69ca4182244fd9eb8711f2ad255f24177d5462;hpb=a3dbef5b8fe7684f844ac50e4295496f12ce8121;p=gosa.git

diff --git a/gosa-si/gosa-si-server b/gosa-si/gosa-si-server
index 8a69ca418..048089fbf 100755
--- a/gosa-si/gosa-si-server
+++ b/gosa-si/gosa-si-server
@@ -1633,7 +1633,7 @@ sub create_fai_server_db {
 
 		# TODO: Find a way to post the 'create_packages_list_db' event
 		if(!defined($dont_create_packages_list)) {
-			&create_packages_list_db($ldap_handle);
+			&create_packages_list_db;
 		}
 	}	
     
@@ -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;
@@ -1960,7 +1963,7 @@ sub session_run_done {
 }
 
 sub create_sources_list {
-    my ($ldap_handle) = @_;
+    my $ldap_handle = &get_ldap_handle;
 	my $result="/tmp/gosa_si_tmp_sources_list";
 
 	# Remove old file
@@ -1995,7 +1998,7 @@ sub create_sources_list {
 }
 
 sub create_packages_list_db {
-    my ($ldap_handle, $sources_file) = @_ ;
+    my ($ldap_handle, $sources_file);
 
 	if (not defined $ldap_handle) { 
 		$ldap_handle= &get_ldap_handle();