msgPool

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

diff --git a/gosa-si/gosa-si-server b/gosa-si/gosa-si-server
index d4833d04f8e0a551b17c4da26a1f463f7d03174c..e0299693216f9db80a1657e67783690b72d67000 100755 (executable)
--- a/gosa-si/gosa-si-server
+++ b/gosa-si/gosa-si-server
@@ -77,7 +77,7 @@ our $no_arp;
 our $verbose;
 our $forground;
 our $cfg_file;
-our ($ldap_handle, $ldap_uri, $ldap_base, $ldap_admin_dn, $ldap_admin_password );
+our ($ldap_handle, $ldap_uri, $ldap_base, $ldap_admin_dn, $ldap_admin_password, $ldap_server_dn);
 
 
 # specifies the verbosity of the daemon_log
@@ -125,7 +125,7 @@ my @login_users_col_names = ('client', 'user', 'timestamp');
 our $fai_server_db;
 our $fai_server_tn = "fai_server"; 
 my $fai_server_file_name;
-our @fai_server_col_names = ('timestamp', 'server', 'release', 'tag'); 
+our @fai_server_col_names = ('timestamp', 'server', 'release', 'sections', 'tag'); 
 our $fai_release_tn = "fai_release"; 
 our @fai_release_col_names = ('timestamp', 'release', 'class', 'type', 'state'); 
 
@@ -149,6 +149,7 @@ our $client_fai_log_dir = "/var/log/fai";
 # queue which stores taskes while max_clients are reached
 my @tasks = qw();
 
+
 %cfg_defaults = (
 "general" => {
     "log-file" => [\$log_file, "/var/run/".$prg.".log"],
@@ -410,7 +411,7 @@ sub sig_int_handler {
        }
 
     daemon_log("shutting down gosa-si-server", 1);
-    exit(0);
+    system("killall gosa-si-server");
 }
 $SIG{INT} = \&sig_int_handler;
 
@@ -852,7 +853,7 @@ sub send_msg_to_target {
         print $socket $crypted_msg."\n";
 
         daemon_log("INFO: send ".$header."msg to $address", 5);
-        daemon_log("message:\n$msg", 8);
+        daemon_log("DEBUG: message:\n$msg", 9);
         
     }
 
@@ -937,7 +938,6 @@ sub _start {
     &trigger_db_loop($kernel);
        $kernel->yield('create_fai_server_db', $fai_server_tn );
        $kernel->yield('create_fai_release_db', $fai_release_tn );
-       $kernel->yield('create_packages_list_db', $sources_list );
 }
 
 sub next_task {
@@ -1014,6 +1014,15 @@ sub process_task {
     }
     # an error occurred
     if(( !$msg ) || ( !$msg_hash ) || ( !$module )){
+        my $sql_statement = "SELECT * FROM $main::known_clients_tn WHERE (hostname LIKE '".$heap->{'remote_ip'}."%')";
+        my $query_res = $known_clients_db->select_dbentry( $sql_statement ); 
+        while( my ($hit_num, $hit) = each %{ $query_res } ) {    
+            my $host_name = $hit->{'hostname'};
+            my $host_key = $hit->{'hostkey'};
+            my $ping_msg = "<xml> <header>gosa_ping</header> <source>$server_address</source> <target>$host_name</target></xml>";
+            my $error = &send_msg_to_target($ping_msg, $host_name, $host_key, "gosa_ping");
+            &update_jobdb_status_for_send_msgs($ping_msg, $error);
+        }
         $error++;
     }
 
@@ -1416,7 +1425,7 @@ sub change_goto_state {
 
 
 sub create_fai_server_db {
-    my ($table_name) = @_;
+    my ($table_name, $kernel) = @_;
        my $result;
 
        if(defined($ldap_handle)) {
@@ -1440,6 +1449,7 @@ sub create_fai_server_db {
                                                                   primkey => ['server', 'release', 'tag'],
                                                                   server => $tmp_url,
                                                                   release => $tmp_release,
+                                                                  sections => $tmp_sections,
                                                                   tag => (length($tmp_tag)>0)?$tmp_tag:"",
                                                           } );
                                           }
@@ -1447,13 +1457,18 @@ sub create_fai_server_db {
                           }
                   }
                daemon_log("INFO: create_fai_server_db: finished", 5);
+
+               # TODO: Find a way to post the 'create_packages_list_db' event
+               &create_packages_list_db();
        }       
+
        return $result;
 }
+
 sub run_create_fai_server_db {
-    my ($session, $heap, $table_name) = @_[SESSION, HEAP, ARG0];
+    my ($kernel, $session, $heap, $table_name) = @_[KERNEL, SESSION, HEAP, ARG0];
     my $task = POE::Wheel::Run->new(
-            Program => sub { &create_fai_server_db($table_name) },
+            Program => sub { &create_fai_server_db($table_name,$kernel) },
             StdoutEvent  => "session_run_result",
             StderrEvent  => "session_run_debug",
             CloseEvent   => "session_run_done",
@@ -1765,9 +1780,40 @@ sub session_run_done {
     delete $heap->{task}->{$task_id};
 }
 
+sub create_sources_list {
+       my $result="/tmp/gosa_si_tmp_sources_list";
+
+       # Remove old file
+       if(stat($result)) {
+               unlink($result);
+       }
+
+       my $fh;
+       open($fh, ">$result") or return undef;
+       if(defined($ldap_server_dn) && length($ldap_server_dn)>0) {
+               my $mesg=$ldap_handle->search(
+                       base    => $ldap_server_dn,
+                       scope   => 'base',
+                       attrs   => 'FAIrepository',
+               );
+
+               if($mesg->count) {
+                       foreach my $entry(@{$mesg->{'entries'}}) {
+                               my ($server, $tag, $release, $sections)= split /\|/, $entry->get_value('FAIrepository');
+                               my $line = "deb $server $release";
+                               $sections =~ s/,/ /g;
+                               $line.= " $sections";
+                               print $fh $line."\n";
+                       }
+               }
+       }
+       close($fh);
+
+       return $result;
+}
 
 sub create_packages_list_db {
-    my ($sources_file) = @_ ;
+    my ($sources_file) = @_ || &create_sources_list;
     my $line;
     daemon_log("INFO: create_packages_list_db: start", 5); 
 
@@ -1807,14 +1853,13 @@ sub create_packages_list_db {
     return;
 }
 sub run_create_packages_list_db {
-    my ($session, $heap, $sources_list) = @_[SESSION, HEAP, ARG0];
+    my ($session, $heap) = @_[SESSION, HEAP];
     my $task = POE::Wheel::Run->new(
-            Program => sub { &create_packages_list_db($sources_list) },
+            Program => sub {&create_packages_list_db},
             StdoutEvent  => "session_run_result",
             StderrEvent  => "session_run_debug",
             CloseEvent   => "session_run_done",
             );
-
     $heap->{task}->{ $task->ID } = $task;
 }
 sub parse_package_info {