Updated enviroment edit handling.

[gosa.git] / gosa-si / gosa-si-server

diff --git a/gosa-si/gosa-si-server b/gosa-si/gosa-si-server
index b6d603042a055468665e565c493edd3b3c7f547e..d73b3c7630b1b65a00ccb0a060de25ce07bba640 100755 (executable)
--- a/gosa-si/gosa-si-server
+++ b/gosa-si/gosa-si-server
@@ -255,7 +255,7 @@ my $max_children = 2;
     "domain"  => [\$server_domain, ""],
     "key"     => [\$ServerPackages_key, "none"],
     "key-lifetime" => [\$foreign_servers_register_delay, 120],
-    "job-synchronization" => [\$job_synchronization, "true"],
+    "job-synchronization-enabled" => [\$job_synchronization, "true"],
     "synchronization-loop" => [\$modified_jobs_loop_delay, 5],
 }
 );
@@ -1470,19 +1470,20 @@ sub session_start {
        $kernel->sig(USR2 => "recreate_packages_db");
        $kernel->delay_set('watch_for_new_jobs', $job_queue_loop_delay);
        $kernel->delay_set('watch_for_done_jobs', $job_queue_loop_delay); 
-       $kernel->delay_set('watch_for_modified_jobs', $modified_jobs_loop_delay); 
+    $kernel->delay_set('watch_for_modified_jobs', $modified_jobs_loop_delay); 
        $kernel->delay_set('watch_for_new_messages', $messaging_db_loop_delay);
     $kernel->delay_set('watch_for_delivery_messages', $messaging_db_loop_delay);
        $kernel->delay_set('watch_for_done_messages', $messaging_db_loop_delay);
     $kernel->delay_set('watch_for_old_known_clients', $job_queue_loop_delay);
 
+
 }
 
 
 sub watch_for_done_jobs {
     my ($kernel,$heap) = @_[KERNEL, HEAP];
 
-    my $sql_statement = "SELECT * FROM ".$job_queue_tn." WHERE status='done'";
+    my $sql_statement = "SELECT * FROM ".$job_queue_tn." WHERE ((status='done') AND (modified='0'))";
        my $res = $job_db->select_dbentry( $sql_statement );
 
     while( my ($id, $hit) = each %{$res} ) {
@@ -1506,22 +1507,12 @@ sub watch_for_modified_jobs {
     # if db contains no jobs which should be update, do nothing
     if (keys %$res != 0) {
 
-        # make out of the db result a gosa-si message   
-        my $update_msg = &db_res2si_msg ($res, "foreign_job_updates", "KNOWN_SERVER", "MY_LOCAL_ADDRESS");
-       
-        # determine all other si-server a foreign_job_updates message should be send
-        my $sql_statement= "SELECT * FROM $known_server_tn";
-        my $res = $known_server_db->select_dbentry( $sql_statement ); 
-        while( my ($hit_num, $hit) = each %$res ) {    
-            my $act_update_msg = $update_msg;
-            my $act_target_address = $hit->{hostname};
-            my $act_target_key = $hit->{hostkey};
-            my ($act_target_ip, $act_target_port) = split(/:/, $act_target_address);
-            my $act_source_address = &get_local_ip_for_remote_ip($act_target_ip).":$act_target_port";
-
-            $act_update_msg =~ s/<target>KNOWN_SERVER<\/target>/<target>$act_target_address<\/target>/g;
-            $act_update_msg =~ s/<source>MY_LOCAL_ADDRESS<\/source>/<source>$act_source_address<\/source>/g;
-            &send_msg_to_target($act_update_msg, $act_target_address, $act_target_key, "foreign_job_updates" , "J");
+        if ($job_synchronization  eq "true") {
+            # make out of the db result a gosa-si message   
+            my $update_msg = &db_res2si_msg ($res, "foreign_job_updates", "KNOWN_SERVER", "MY_LOCAL_ADDRESS");
+ 
+            # update all other SI-server
+            &inform_all_other_si_server($update_msg);
         }
 
         # set jobs all jobs to modified = 0, wait until the next modification for updates of other si-server