X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-si%2Fgosa-si-server;h=5ee945afe0e9cf7af2abbedaef1f1339cbec1171;hb=cd2b562f00e37a3aa2d7b21eaad8472feaedf4ae;hp=e18617b874502a3dda7fa90c27410788da7bab24;hpb=59cd693c2b308a0ee75c94d6e292fe24349c3c07;p=gosa.git diff --git a/gosa-si/gosa-si-server b/gosa-si/gosa-si-server index e18617b87..5ee945afe 100755 --- a/gosa-si/gosa-si-server +++ b/gosa-si/gosa-si-server @@ -64,6 +64,7 @@ my (%cfg_defaults, $foreground, $verbose, $ping_timeout); my ($bus_activ, $bus, $msg_to_bus, $bus_cipher); my ($server); my ($gosa_server, $job_queue_timeout, $job_queue_loop_delay); +my ($messaging_db_loop_delay); my ($known_modules); my ($pid_file, $procid, $pid, $log_file); my ($arp_activ, $arp_fifo); @@ -162,7 +163,7 @@ my $arch = "i386"; # holds all messages which should be delivered to a user our $messaging_db; our $messaging_tn = "messaging"; -our @messaging_col_names = ('subject', 'from', 'to', 'flag', 'direction', 'delivery_time', 'message', 'timestamp', 'id INTEGER', ); +our @messaging_col_names = ('subject', 'message_from', 'message_to', 'flag', 'direction', 'delivery_time', 'message', 'timestamp', 'id INTEGER' ); my $messaging_file_name; # path to directory to store client install log files @@ -203,6 +204,7 @@ my $max_children = 2; "port" => [\$gosa_port, "20082"], "job-queue" => [\$job_queue_file_name, '/var/lib/gosa-si/jobs.db'], "job-queue-loop-delay" => [\$job_queue_loop_delay, 3], + "messaging-db-loop-delay" => [\$messaging_db_loop_delay, 3], "key" => [\$GosaPackages_key, "none"], }, "SIPackages" => { @@ -241,7 +243,7 @@ EOF #=============================================================================== sub read_configfile { my $cfg; - if( defined( $cfg_file) && ( length($cfg_file) > 0 )) { + if( defined( $cfg_file) && ( (-s $cfg_file) > 0 )) { if( -r $cfg_file ) { $cfg = Config::IniFiles->new( -file => $cfg_file ); } else { @@ -437,7 +439,7 @@ sub sig_int_handler { daemon_log("shutting down gosa-si-server", 1); - system("killall gosa-si-server"); + system("kill `ps -C gosa-si-server -o pid=`"); } $SIG{INT} = \&sig_int_handler; @@ -968,6 +970,7 @@ sub _start { $kernel->yield('create_fai_server_db', $fai_server_tn ); $kernel->yield('create_fai_release_db', $fai_release_tn ); $kernel->sig(USR1 => "sig_handler"); + $kernel->sig(USR2 => "create_packages_list_db"); } sub sig_handler { @@ -1233,7 +1236,9 @@ sub process_task { sub trigger_db_loop { my ($kernel) = @_ ; $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_done_jobs', $job_queue_loop_delay); + $kernel->delay_set('watch_for_new_messages', $messaging_db_loop_delay); + $kernel->delay_set('watch_for_done_messages', $messaging_db_loop_delay); } sub watch_for_done_jobs { @@ -1256,37 +1261,161 @@ sub watch_for_new_jobs { my ($kernel,$heap) = @_[KERNEL, HEAP]; # check gosa job queue for jobs with executable timestamp + my $timestamp = &get_time(); + my $sql_statement = "SELECT * FROM $job_queue_tn WHERE status='waiting' AND (CAST (timestamp AS INTEGER) + 120) < $timestamp ORDER BY timestamp"; + my $res = $job_db->exec_statement( $sql_statement ); + + # Merge all new jobs that would do the same actions + my @drops; + my $hits; + foreach my $hit (reverse @{$res} ) { + my $macaddress= lc @{$hit}[8]; + my $headertag= @{$hit}[5]; + if(defined($hits->{$macaddress}->{$headertag})) { + push @drops, "DELETE FROM $job_queue_tn WHERE id = '$hits->{$macaddress}->{$headertag}[0]'"; + } + $hits->{$macaddress}->{$headertag}= $hit; + } + + # Delete new jobs with a matching job in state 'processing' + foreach my $macaddress (keys %{$hits}) { + foreach my $jobdb_headertag (keys %{$hits->{$macaddress}}) { + my $jobdb_id = @{$hits->{$macaddress}->{$jobdb_headertag}}[0]; + my $sql_statement = "SELECT * FROM $job_queue_tn WHERE macaddress LIKE '$macaddress' AND headertag='$jobdb_headertag' AND status='processing'"; + my $res = $job_db->exec_statement( $sql_statement ); + foreach my $hit (@{$res}) { + push @drops, "DELETE FROM $job_queue_tn WHERE id = '$jobdb_id'"; + } + } + } + + # Commit deletion + $job_db->exec_statementlist(\@drops); + + # Look for new jobs that could be executed + foreach my $macaddress (keys %{$hits}) { + + # Look if there is an executing job + my $sql_statement = "SELECT * FROM $job_queue_tn WHERE macaddress LIKE '$macaddress' AND status='processing'"; + my $res = $job_db->exec_statement( $sql_statement ); + + # Skip new jobs for host if there is a processing job + if(defined($res) and defined @{$res}[0]) { + next; + } + + foreach my $jobdb_headertag (keys %{$hits->{$macaddress}}) { + my $jobdb_id = @{$hits->{$macaddress}->{$jobdb_headertag}}[0]; + my $job_msg = @{$hits->{$macaddress}->{$jobdb_headertag}}[7]; + + daemon_log("J DEBUG: its time to execute $job_msg", 7); + my $sql_statement = "SELECT * FROM known_clients WHERE macaddress LIKE '$macaddress'"; + my $res_hash = $known_clients_db->select_dbentry( $sql_statement ); + + # expect macaddress is unique!!!!!! + my $target = $res_hash->{1}->{hostname}; + + # change header + $job_msg =~ s/
job_/
gosa_/; + + # add sqlite_id + $job_msg =~ s/<\/xml>$/$jobdb_id<\/jobdb_id><\/xml>/; + + $job_msg =~ /
(\S+)<\/header>/; + my $header = $1 ; + my $func_error = &send_msg_to_target($job_msg, $server_address, $GosaPackages_key, $header, "J"); + + # update status in job queue to 'processing' + $sql_statement = "UPDATE $job_queue_tn SET status='processing' WHERE id='$jobdb_id'"; + my $res = $job_db->update_dbentry($sql_statement); + + # We don't want parallel processing + last; + } + } + + $kernel->delay_set('watch_for_new_jobs', $job_queue_loop_delay); +} + + +sub watch_for_new_messages { + my ($kernel,$heap) = @_[KERNEL, HEAP]; + my @coll_user_msg; # collection list of outgoing messages + + # check messaging_db for new incoming messages with executable timestamp my $timestamp = &get_time(); - my $sql_statement = "SELECT * FROM ".$job_queue_tn. - " WHERE status='waiting' AND timestamp<'$timestamp'"; - my $res = $job_db->select_dbentry( $sql_statement ); + #my $sql_statement = "SELECT * FROM $messaging_tn WHERE (CAST (delivery_time AS INTEGER) + 120) < $timestamp"; + my $sql_statement = "SELECT * FROM $messaging_tn WHERE ( (CAST(timestamp AS INTEGER))<$timestamp AND flag='n' AND direction='in' )"; + my $res = $messaging_db->exec_statement( $sql_statement ); + + foreach my $hit (@{$res}) { + + # create outgoing messages + my $message_to = @{$hit}[2]; + + # translate message_to to plain login name + my @reciever_l = ($message_to); + my $message_id = @{$hit}[8]; + + #add each outgoing msg to messaging_db + my $reciever; + foreach $reciever (@reciever_l) { + my $sql_statement = "INSERT INTO $messaging_tn (subject, message_from, message_to, flag, direction, delivery_time, message, timestamp, id) ". + "VALUES ('". + @{$hit}[0]."', '". # subject + @{$hit}[1]."', '". # message_from + $reciever."', '". # message_to + "none"."', '". # flag + "out"."', '". # direction + @{$hit}[5]."', '". # delivery_time + @{$hit}[6]."', '". # message + $timestamp."', '". # timestamp + @{$hit}[8]. # id + "')"; + &daemon_log("M DEBUG: $sql_statement", 1); + my $res = $messaging_db->exec_statement($sql_statement); + &daemon_log("M INFO: message '".@{$hit}[8]."' is prepared for delivery to reciever '$reciever'", 5); + } + + # send outgoing messages + my $sql_statement = "SELECT * FROM $messaging_tn WHERE ( flag='p' AND direction='out' )"; + my $res = $messaging_db->exec_statement( $sql_statement ); + foreach my $hit (@{$res}) { + # add subject, from, to and message to list coll_user_msg + my @user_msg = [@{$hit}[0], @{$hit}[1], $reciever, @{$hit}[6]]; + push( @coll_user_msg, \@user_msg); + } + + # send outgoing list to myself (gosa-si-server) to deliver each message to user + # reason for this workaround: if to much messages have to be delivered, it can come to + # denial of service problems of the server. so, the incoming message list can be processed + # by a forked child and gosa-si-server is always ready to work. + my $collection_out_msg = &create_xml_hash("collection_user_messages", $server_address, $server_address); + # add to hash 'msg1' => [subject, from, to, message] + # hash to string + # send msg to myself +# TODO + + # set incoming message to flag d=deliverd + $sql_statement = "UPDATE $messaging_tn SET flag='p' WHERE id='$message_id'"; + &daemon_log("M DEBUG: $sql_statement", 7); + $res = $messaging_db->update_dbentry($sql_statement); + &daemon_log("M INFO: message '".@{$hit}[8]."' is set to flag 'p' (processed)", 5); - while( my ($id, $hit) = each %{$res} ) { - my $jobdb_id = $hit->{id}; - my $macaddress = $hit->{'macaddress'}; - my $job_msg = $hit->{'xmlmessage'}; - daemon_log("J DEBUG: its time to execute $job_msg", 7); - my $sql_statement = "SELECT * FROM known_clients WHERE macaddress LIKE '$macaddress'"; - my $res_hash = $known_clients_db->select_dbentry( $sql_statement ); - # expect macaddress is unique!!!!!! - my $target = $res_hash->{1}->{hostname}; - - # change header - $job_msg =~ s/
job_/
gosa_/; - - # add sqlite_id - $job_msg =~ s/<\/xml>$/$jobdb_id<\/jobdb_id><\/xml>/; - - $job_msg =~ /
(\S+)<\/header>/; - my $header = $1 ; - my $func_error = &send_msg_to_target($job_msg, $server_address, $GosaPackages_key, $header, "J"); - - # update status in job queue to 'processing' - $sql_statement = "UPDATE $job_queue_tn SET status='processing' WHERE id='$jobdb_id'"; - my $res = $job_db->update_dbentry($sql_statement); } + + $kernel->delay_set('watch_for_new_messages', $messaging_db_loop_delay); - $kernel->delay_set('watch_for_new_jobs', $job_queue_loop_delay); + + return; +} + + +sub watch_for_done_messages { + my ($kernel,$heap) = @_[KERNEL, HEAP]; + + $kernel->delay_set('watch_for_done_messages', $messaging_db_loop_delay); + return; } @@ -1373,38 +1502,37 @@ sub change_fai_state { filter => "$search" ); - if ($mesg->count) { - my @entries = $mesg->entries; - foreach my $entry (@entries) { - # Only modify entry if it is not set to '$state' - if ($entry->get_value("FAIstate") ne "$state"){ - daemon_log("$session_id INFO: Setting FAIstate to '$state' for ".$entry->dn, 5); - my $result; - my %tmp = map { $_ => 1 } $entry->get_value("objectClass"); - if (exists $tmp{'FAIobject'}){ - if ($state eq ''){ - $result= $ldap_handle->modify($entry->dn, changes => [ - delete => [ FAIstate => [] ] ]); - } else { - $result= $ldap_handle->modify($entry->dn, changes => [ - replace => [ FAIstate => $state ] ]); - } - } elsif ($state ne ''){ - $result= $ldap_handle->modify($entry->dn, changes => [ - add => [ objectClass => 'FAIobject' ], - add => [ FAIstate => $state ] ]); - } - - # Errors? - if ($result->code){ - daemon_log("$session_id Error: Setting FAIstate to '$state' for ".$entry->dn. "failed: ".$result->error, 1); - } - - } else { - daemon_log("$session_id DEBUG FAIstate at host '$_' already at state '$st'", 7); - } - } - } + if ($mesg->count) { + my @entries = $mesg->entries; + foreach my $entry (@entries) { + # Only modify entry if it is not set to '$state' + if ($entry->get_value("FAIstate") ne "$state"){ + daemon_log("$session_id INFO: Setting FAIstate to '$state' for ".$entry->dn, 5); + my $result; + my %tmp = map { $_ => 1 } $entry->get_value("objectClass"); + if (exists $tmp{'FAIobject'}){ + if ($state eq ''){ + $result= $ldap_handle->modify($entry->dn, changes => [ + delete => [ FAIstate => [] ] ]); + } else { + $result= $ldap_handle->modify($entry->dn, changes => [ + replace => [ FAIstate => $state ] ]); + } + } elsif ($state ne ''){ + $result= $ldap_handle->modify($entry->dn, changes => [ + add => [ objectClass => 'FAIobject' ], + add => [ FAIstate => $state ] ]); + } + + # Errors? + if ($result->code){ + daemon_log("$session_id Error: Setting FAIstate to '$state' for ".$entry->dn. "failed: ".$result->error, 1); + } + } else { + daemon_log("$session_id DEBUG FAIstate at host '".$entry->dn."' already at state '$st'", 7); + } + } + } # if no ldap handle defined } else { daemon_log("$session_id ERROR: no LDAP handle defined for update FAIstate", 1); @@ -1846,11 +1974,13 @@ sub create_sources_list { ); 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"; + foreach my $value(@{$entry->get_value('FAIrepository', asref => 1)}) { + my ($server, $tag, $release, $sections)= split /\|/, $value; + my $line = "deb $server $release"; + $sections =~ s/,/ /g; + $line.= " $sections"; + print $fh $line."\n"; + } } } } @@ -1862,10 +1992,15 @@ sub create_sources_list { sub create_packages_list_db { my ($ldap_handle, $sources_file) = @_ ; - if (not defined $ldap_handle) { - daemon_log("0 ERROR: no ldap_handle available to create_packages_list_db", 1); - return; - } + if (not defined $ldap_handle) { + $ldap_handle= &get_ldap_handle(); + + if (not defined $ldap_handle) { + daemon_log("0 ERROR: no ldap_handle available to create_packages_list_db", 1); + return; + } + } + if (not defined $sources_file) { $sources_file = &create_sources_list($ldap_handle); } @@ -2141,6 +2276,7 @@ $login_users_db = GOSA::DBsqlite->new($login_users_file_name); $login_users_db->create_table($login_users_tn, \@login_users_col_names); # connect to fai_server_db and fai_release_db +unlink($fai_server_file_name); $fai_server_db = GOSA::DBsqlite->new($fai_server_file_name); $fai_server_db->create_table($fai_server_tn, \@fai_server_col_names); $fai_server_db->create_table($fai_release_tn, \@fai_release_col_names); @@ -2183,6 +2319,8 @@ POE::Session->create( inline_states => { _start => \&_start, sig_handler => \&sig_handler, + watch_for_new_messages => \&watch_for_new_messages, + watch_for_done_messages => \&watch_for_done_messages, watch_for_new_jobs => \&watch_for_new_jobs, watch_for_done_jobs => \&watch_for_done_jobs, create_packages_list_db => \&run_create_packages_list_db,