X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=gosa-si%2Fgosa-si-server;h=dc82ecbef8735aa547fab5266472648e633bf9b1;hb=6f0bb784cedaee0568cf387780afb7d4fd189335;hp=872d8dd742cbd0446321fd9cffdee0617f358c5d;hpb=23a95c8513afb2c660b8211d3482b803c27396ff;p=gosa.git diff --git a/gosa-si/gosa-si-server b/gosa-si/gosa-si-server index 872d8dd74..dc82ecbef 100755 --- a/gosa-si/gosa-si-server +++ b/gosa-si/gosa-si-server @@ -52,6 +52,11 @@ use Net::LDAP::Util qw(:escape); my $modules_path = "/usr/lib/gosa-si/modules"; use lib "/usr/lib/gosa-si/modules"; +my $server_version = '$HeadURL$:$Rev$'; +my $server_headURL; +my $server_revision; +my $server_status; + # TODO es gibt eine globale funktion get_ldap_handle # - ist in einer session dieses ldap handle schon vorhanden, wird es zurückgegeben @@ -107,7 +112,8 @@ $ping_timeout = 5; $no_bus = 0; $bus_activ = "true"; $no_arp = 0; -my $packages_list_under_construction = 0; +my $packages_list_under_construction = "/tmp/packages_list_creation_in_progress"; +my @packages_list_statements; my $watch_for_new_jobs_in_progress = 0; our $prg= basename($0); @@ -283,6 +289,7 @@ sub daemon_log { if(not defined $level) { $level = 1 } if(defined $log_file){ open(LOG_HANDLE, ">>$log_file"); + chmod 0600, $log_file; if(not defined open( LOG_HANDLE, ">>$log_file" )) { print STDERR "cannot open $log_file: $!"; return } @@ -957,7 +964,7 @@ sub update_jobdb_status_for_send_msgs { if (not $answer =~ /
trigger_action_reinstall<\/header>/) { my $sql_statement = "UPDATE $job_queue_tn ". "SET status='error', result='can not deliver msg, please consult log file' ". - "WHERE id='$jobdb_id'"; + "WHERE id=$jobdb_id"; my $res = $job_db->update_dbentry($sql_statement); } @@ -965,7 +972,7 @@ sub update_jobdb_status_for_send_msgs { } else { my $sql_statement = "UPDATE $job_queue_tn ". "SET status='done' ". - "WHERE id='$jobdb_id' AND status='processed'"; + "WHERE id=$jobdb_id AND status='processed'"; my $res = $job_db->update_dbentry($sql_statement); } } @@ -1248,10 +1255,12 @@ 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_new_messages', $messaging_db_loop_delay); - $kernel->delay_set('watch_for_done_messages', $messaging_db_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); } + sub watch_for_done_jobs { my ($kernel,$heap) = @_[KERNEL, HEAP]; @@ -1261,13 +1270,14 @@ sub watch_for_done_jobs { while( my ($id, $hit) = each %{$res} ) { my $jobdb_id = $hit->{id}; - my $sql_statement = "DELETE FROM $job_queue_tn WHERE id='$jobdb_id'"; - my $res = $job_db->del_dbentry($sql_statement); + my $sql_statement = "DELETE FROM $job_queue_tn WHERE id=$jobdb_id"; + my $res = $job_db->del_dbentry($sql_statement); } $kernel->delay_set('watch_for_done_jobs',$job_queue_loop_delay); } + sub watch_for_new_jobs { if($watch_for_new_jobs_in_progress == 0) { $watch_for_new_jobs_in_progress = 1; @@ -1289,7 +1299,7 @@ sub watch_for_new_jobs { defined($hits->{$macaddress}->{$headertag}) && defined($hits->{$macaddress}->{$headertag}[0]) ) { - push @drops, "DELETE FROM $job_queue_tn WHERE id = '$hits->{$macaddress}->{$headertag}[0]'"; + push @drops, "DELETE FROM $job_queue_tn WHERE id = $hits->{$macaddress}->{$headertag}[0]"; } $hits->{$macaddress}->{$headertag}= $hit; } @@ -1302,7 +1312,7 @@ sub watch_for_new_jobs { 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'"; + push @drops, "DELETE FROM $job_queue_tn WHERE id=$jobdb_id"; } } else { daemon_log("J ERROR: Job without id exists for macaddress $macaddress!", 1); @@ -1348,8 +1358,9 @@ sub watch_for_new_jobs { 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'"; + $sql_statement = "UPDATE $job_queue_tn SET status='processing' WHERE id=$jobdb_id"; my $res = $job_db->update_dbentry($sql_statement); +# TODO: abfangen ob alles in ordnung ist oder nicht, wenn nicht error schmeißen # We don't want parallel processing last; @@ -1375,21 +1386,33 @@ sub watch_for_new_messages { # create outgoing messages my $message_to = @{$hit}[3]; - # translate message_to to plain login name -# TODO implement reciever translation - my @reciever_l = ($message_to); + my @message_to_l = split(/,/, $message_to); + my %receiver_h; + foreach my $receiver (@message_to_l) { + if ($receiver =~ /^u_([\s\S]*)$/) { + $receiver_h{$1} = 0; + } elsif ($receiver =~ /^g_([\s\S]*)$/) { +# TODO implement receiver translation + } else { + my $sbjct = &encode_base64(@{$hit}[1]); + my $msg = &encode_base64(@{$hit}[7]); + &daemon_log("M WARNING: unknown receiver '$receiver' for a user-message 'sbjct - msg'", 3); + } + } + my @receiver_l = keys(%receiver_h); + my $message_id = @{$hit}[0]; #add each outgoing msg to messaging_db - my $reciever; - foreach $reciever (@reciever_l) { + my $receiver; + foreach $receiver (@receiver_l) { my $sql_statement = "INSERT INTO $messaging_tn (id, subject, message_from, message_to, flag, direction, delivery_time, message, timestamp) ". "VALUES ('". $message_id."', '". # id @{$hit}[1]."', '". # subject @{$hit}[2]."', '". # message_from - $reciever."', '". # message_to + $receiver."', '". # message_to "none"."', '". # flag "out"."', '". # direction @{$hit}[6]."', '". # delivery_time @@ -1398,39 +1421,75 @@ sub watch_for_new_messages { ")"; &daemon_log("M DEBUG: $sql_statement", 1); my $res = $messaging_db->exec_statement($sql_statement); - &daemon_log("M INFO: message '".@{$hit}[0]."' 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}[1], @{$hit}[2], $reciever, @{$hit}[7]]; - push( @coll_user_msg, \@user_msg); + &daemon_log("M INFO: message '".@{$hit}[0]."' is prepared for delivery to receiver '$receiver'", 5); } - # 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 '$message_id' is set to flag 'p' (processed)", 5); - } - + $kernel->delay_set('watch_for_new_messages', $messaging_db_loop_delay); + return; +} + +sub watch_for_delivery_messages { + my ($kernel, $heap) = @_[KERNEL, HEAP]; + + # select outgoing messages + my $sql_statement = "SELECT * FROM $messaging_tn WHERE ( flag='p' AND direction='out' )"; + #&daemon_log("0 DEBUG: $sql", 7); + my $res = $messaging_db->exec_statement( $sql_statement ); + + # build out msg for each usr + foreach my $hit (@{$res}) { + my $receiver = @{$hit}[3]; + my $msg_id = @{$hit}[0]; + my $subject = @{$hit}[1]; + my $message = @{$hit}[7]; + + # resolve usr -> host where usr is logged in + my $sql = "SELECT * FROM $login_users_tn WHERE (user='$receiver')"; + #&daemon_log("0 DEBUG: $sql", 7); + my $res = $login_users_db->exec_statement($sql); + + # reciver is logged in nowhere + if (not ref(@$res[0]) eq "ARRAY") { next; } + + my $send_succeed = 0; + foreach my $hit (@$res) { + my $receiver_host = @$hit[0]; + &daemon_log("M DEBUG: user '$receiver' is logged in at host '$receiver_host'", 7); + + # fetch key to encrypt msg propperly for usr/host + my $sql = "SELECT * FROM $known_clients_tn WHERE (hostname='$receiver_host')"; + &daemon_log("0 DEBUG: $sql", 7); + my $res = $known_clients_db->exec_statement($sql); + + # host is already down + if (not ref(@$res[0]) eq "ARRAY") { next; } + + # host is on + my $receiver_key = @{@{$res}[0]}[2]; + my %data = ('subject' => $subject, 'message' => $message, 'usr' => $receiver); + my $out_msg = &build_msg("usr_msg", $server_address, $receiver_host, \%data ); + my $error = &send_msg_to_target($out_msg, $receiver_host, $receiver_key, "usr_msg", 0); + if ($error == 0 ) { + $send_succeed++ ; + } + } + if ($send_succeed) { + # set outgoing msg at db to deliverd + my $sql = "UPDATE $messaging_tn SET flag='d' WHERE (id='$msg_id' AND direction='out' AND message_to='$receiver')"; + &daemon_log("0 DEBUG: $sql", 7); + my $res = $messaging_db->exec_statement($sql); + } + } + $kernel->delay_set('watch_for_delivery_messages', $messaging_db_loop_delay); return; } @@ -1438,6 +1497,26 @@ sub watch_for_new_messages { sub watch_for_done_messages { my ($kernel,$heap) = @_[KERNEL, HEAP]; + my $sql = "SELECT * FROM $messaging_tn WHERE (flag='p' AND direction='in')"; + #&daemon_log("0 DEBUG: $sql", 7); + my $res = $messaging_db->exec_statement($sql); + + foreach my $hit (@{$res}) { + my $msg_id = @{$hit}[0]; + + my $sql = "SELECT * FROM $messaging_tn WHERE (id='$msg_id' AND direction='out' AND (NOT flag='s'))"; + #&daemon_log("0 DEBUG: $sql", 7); + my $res = $messaging_db->exec_statement($sql); + + # not all usr msgs have been seen till now + if ( ref(@$res[0]) eq "ARRAY") { next; } + + $sql = "DELETE FROM $messaging_tn WHERE (id='$msg_id')"; + #&daemon_log("0 DEBUG: $sql", 7); + $res = $messaging_db->exec_statement($sql); + + } + $kernel->delay_set('watch_for_done_messages', $messaging_db_loop_delay); return; } @@ -1743,7 +1822,8 @@ sub create_fai_release_db { daemon_log("$session_id DEBUG: Inserting ".scalar @sql_list." entries to DB",8); if(@sql_list) { - unshift @sql_list, "DELETE FROM $table_name"; # at first, clear db + unshift @sql_list, "VACUUM"; + unshift @sql_list, "DELETE FROM $table_name"; $fai_release_db->exec_statementlist(\@sql_list); } daemon_log("$session_id DEBUG: Done with inserting",7); @@ -1993,30 +2073,31 @@ sub session_run_done { delete $heap->{task}->{$task_id}; } + sub create_sources_list { - my ($session_id) = @_; - my $ldap_handle = &get_ldap_handle; + my $session_id = shift; + my $ldap_handle = &main::get_ldap_handle; my $result="/tmp/gosa_si_tmp_sources_list"; # Remove old file if(stat($result)) { unlink($result); - &main::daemon_log("$session_id DEBUG: remove an old version of '$result'", 7); + &main::daemon_log("$session_id DEBUG: remove an old version of '$result'", 7); } my $fh; open($fh, ">$result"); - if (not defined $fh) { - &main::daemon_log("$session_id DEBUG: cannot open '$result' for writing", 7); - return undef; - } - if(defined($ldap_server_dn) and length($ldap_server_dn) > 0) { + if (not defined $fh) { + &main::daemon_log("$session_id DEBUG: cannot open '$result' for writing", 7); + return undef; + } + if(defined($main::ldap_server_dn) and length($main::ldap_server_dn) > 0) { my $mesg=$ldap_handle->search( - base => $ldap_server_dn, - scope => 'base', - attrs => 'FAIrepository', - filter => 'objectClass=FAIrepositoryServer' - ); + base => $main::ldap_server_dn, + scope => 'base', + attrs => 'FAIrepository', + filter => 'objectClass=FAIrepositoryServer' + ); if($mesg->count) { foreach my $entry(@{$mesg->{'entries'}}) { foreach my $value(@{$entry->get_value('FAIrepository', asref => 1)}) { @@ -2029,8 +2110,12 @@ sub create_sources_list { } } } else { - &main::daemon_log("$session_id ERROR: something wrong with ldap_server_dn '$ldap_server_dn', abort create_sources_list", 1); - } + if (defined $main::ldap_server_dn){ + &main::daemon_log("$session_id ERROR: something wrong with ldap_server_dn '$main::ldap_server_dn', abort create_sources_list", 1); + } else { + &main::daemon_log("$session_id ERROR: no ldap_server_dn found, abort create_sources_list", 1); + } + } close($fh); return $result; @@ -2038,10 +2123,11 @@ sub create_sources_list { sub run_create_packages_list_db { - my ($session, $heap) = @_[SESSION, HEAP]; + my ($kernel, $session, $heap) = @_[KERNEL, SESSION, HEAP]; my $session_id = $session->ID; my $task = POE::Wheel::Run->new( + Priority => +20, Program => sub {&create_packages_list_db(undef, undef, $session_id)}, StdoutEvent => "session_run_result", StderrEvent => "session_run_debug", @@ -2052,7 +2138,20 @@ sub run_create_packages_list_db { sub create_packages_list_db { - my ($ldap_handle, $sources_file, $session_id) = @_; + my ($ldap_handle, $sources_file, $session_id) = @_; + + # it should not be possible to trigger a recreation of packages_list_db + # while packages_list_db is under construction, so set flag packages_list_under_construction + # which is tested befor recreation can be started + if (-r $packages_list_under_construction) { + daemon_log("$session_id WARNING: packages_list_db is right now under construction, please wait until this process is finished", 3); + return; + } else { + daemon_log("$session_id INFO: create_packages_list_db: start", 5); + # set packages_list_under_construction to true + system("touch $packages_list_under_construction"); + @packages_list_statements=(); + } if (not defined $session_id) { $session_id = 0; } if (not defined $ldap_handle) { @@ -2060,69 +2159,176 @@ sub create_packages_list_db { if (not defined $ldap_handle) { daemon_log("$session_id ERROR: no ldap_handle available to create_packages_list_db", 1); + unlink($packages_list_under_construction); return; } } - if (not defined $sources_file) { - &main::daemon_log("$session_id INFO: no sources_file given for creating packages list so trigger creation of it", 5); - $sources_file = &create_sources_list($session_id); - } + if (not defined $sources_file) { + &main::daemon_log("$session_id INFO: no sources_file given for creating packages list so trigger creation of it", 5); + $sources_file = &create_sources_list($session_id); + } - if (not defined $sources_file) { - &main::daemon_log("$session_id ERROR: no sources_file given under '$sources_file', skip create_packages_list_db", 1); + if (not defined $sources_file) { + &main::daemon_log("$session_id ERROR: no sources_file given under '$sources_file', skip create_packages_list_db", 1); + unlink($packages_list_under_construction); + return; + } - } + my $line; - # it should not be possible to trigger a recreation of packages_list_db - # while packages_list_db is under construction, so set flag packages_list_under_construction - # which is tested befor recreation can be started - if ($packages_list_under_construction) { - daemon_log("$session_id WARNING: packages_list_db is right now under construction, please wait untill this process is finished", 3); - return; - } else { - daemon_log("$session_id INFO: create_packages_list_db: start", 5); - # set packages_list_under_construction to true - $packages_list_under_construction = 1; + open(CONFIG, "<$sources_file") or do { + daemon_log( "$session_id ERROR: create_packages_list_db: Failed to open '$sources_file'", 1); + unlink($packages_list_under_construction); + return; + }; + + # Read lines + while ($line = ){ + # Unify + chop($line); + $line =~ s/^\s+//; + $line =~ s/^\s+/ /; + + # Strip comments + $line =~ s/#.*$//g; + + # Skip empty lines + if ($line =~ /^\s*$/){ + next; + } + + # Interpret deb line + if ($line =~ /^deb [^\s]+\s[^\s]+\s[^\s]+/){ + my( $baseurl, $dist, $sections ) = ($line =~ /^deb\s([^\s]+)\s+([^\s]+)\s+(.*)$/); + my $section; + foreach $section (split(' ', $sections)){ + &parse_package_info( $baseurl, $dist, $section, $session_id ); + } + } } - my $line; - open(CONFIG, "<$sources_file") or do { - daemon_log( "$session_id ERROR: create_packages_list_db: Failed to open '$sources_file'", 1); - return; - }; - - # Read lines - while ($line = ){ - # Unify - chop($line); - $line =~ s/^\s+//; - $line =~ s/^\s+/ /; + close (CONFIG); + + find(\&cleanup_and_extract, keys( %repo_dirs )); + eval { + &main::strip_packages_list_statements(); + }; + if($@) { + daemon_log("$session_id ERROR: Preparation of statement list failed with '$@'!", 1); + } + unshift @packages_list_statements, "VACUUM"; + eval { + $packages_list_db->exec_statementlist(\@packages_list_statements); + }; + if($@) { + daemon_log("$session_id ERROR: Updating package_list_db failed with '$@'!", 1); + } + unlink($packages_list_under_construction); + daemon_log("$session_id INFO: create_packages_list_db: finished", 5); + return; +} - # Strip comments - $line =~ s/#.*$//g; - # Skip empty lines - if ($line =~ /^\s*$/){ - next; - } +# This function should do some intensive task to minimize the db-traffic +sub strip_packages_list_statements { + my @existing_entries= @{$packages_list_db->exec_statement("SELECT * FROM $main::packages_list_tn")}; + my @new_statement_list=(); + my $hash; + my $insert_hash; + my $update_hash; + my $delete_hash; + my $local_timestamp=get_time(); - # Interpret deb line - if ($line =~ /^deb [^\s]+\s[^\s]+\s[^\s]+/){ - my( $baseurl, $dist, $sections ) = ($line =~ /^deb\s([^\s]+)\s+([^\s]+)\s+(.*)$/); - my $section; - foreach $section (split(' ', $sections)){ - &parse_package_info( $baseurl, $dist, $section, $session_id ); - } - } - } + foreach my $existing_entry (@existing_entries) { + $hash->{@{$existing_entry}[0]}->{@{$existing_entry}[1]}->{@{$existing_entry}[2]}= $existing_entry; + } + + foreach my $statement (@packages_list_statements) { + if($statement =~ /^INSERT/i) { + # Assign the values from the insert statement + my ($distribution,$package,$version,$section,$description,$template,$timestamp) = ($1,$2,$3,$4,$5,$6,$7) if $statement =~ + /^INSERT\s+?INTO\s+?$main::packages_list_tn\s+?VALUES\s*?\('(.*?)',\s*?'(.*?)',\s*?'(.*?)',\s*?'(.*?)',\s*?'(.*?)',\s*?'(.*?)',\s*?'(.*?)'\s*?\)$/si; + if(exists($hash->{$distribution}->{$package}->{$version})) { + # If section or description has changed, update the DB + if( + (! (@{$hash->{$distribution}->{$package}->{$version}}[3] eq $section)) or + (! (@{$hash->{$distribution}->{$package}->{$version}}[4] eq $description)) + ) { + @{$update_hash->{$distribution}->{$package}->{$version}} = ($distribution,$package,$version,$section,$description,undef); + } + } else { + # Insert a non-existing entry to db + @{$insert_hash->{$distribution}->{$package}->{$version}} = ($distribution,$package,$version,$section,$description,$template); + } + } elsif ($statement =~ /^UPDATE/i) { + my ($template,$package,$version) = ($1,$2,$3) if $statement =~ + /^update\s+?$main::packages_list_tn\s+?set\s+?template\s*?=\s*?'(.*?)'\s+?where\s+?package\s*?=\s*?'(.*?)'\s+?and\s+?version\s*?=\s*?'(.*?)'\s*?;$/si; + foreach my $distribution (keys %{$hash}) { + if(exists($insert_hash->{$distribution}->{$package}->{$version})) { + # update the insertion hash to execute only one query per package (insert instead insert+update) + @{$insert_hash->{$distribution}->{$package}->{$version}}[5]= $template; + } elsif(exists($hash->{$distribution}->{$package}->{$version})) { + if( ! (@{$hash->{$distribution}->{$package}->{$version}}[5] eq $template)) { + my $section; + my $description; + if(defined(@{$update_hash->{$distribution}->{$package}->{$version}}[3]) and + length(@{$update_hash->{$distribution}->{$package}->{$version}}[3]) > 0 ) { + $section= @{$update_hash->{$distribution}->{$package}->{$version}}[3]; + } + if(defined(@{$update_hash->{$distribution}->{$package}->{$version}}[4])) { + $description= @{$update_hash->{$distribution}->{$package}->{$version}}[4]; + } + @{$update_hash->{$distribution}->{$package}->{$version}} = ($distribution,$package,$version,$section,$description,$template); + } + } + } + } + } - close (CONFIG); + # TODO: Check for orphaned entries + + # unroll the insert_hash + foreach my $distribution (keys %{$insert_hash}) { + foreach my $package (keys %{$insert_hash->{$distribution}}) { + foreach my $version (keys %{$insert_hash->{$distribution}->{$package}}) { + push @new_statement_list, "INSERT INTO $main::packages_list_tn VALUES ('$distribution','$package','$version'," + ."'@{$insert_hash->{$distribution}->{$package}->{$version}}[3]'," + ."'@{$insert_hash->{$distribution}->{$package}->{$version}}[4]'," + ."'@{$insert_hash->{$distribution}->{$package}->{$version}}[5]'," + ."'$local_timestamp')"; + } + } + } - daemon_log("$session_id INFO: create_packages_list_db: finished", 5); - # set packages_list_under_construction to false - $packages_list_under_construction = 0; + # unroll the update hash + foreach my $distribution (keys %{$update_hash}) { + foreach my $package (keys %{$update_hash->{$distribution}}) { + foreach my $version (keys %{$update_hash->{$distribution}->{$package}}) { + my $set = ""; + if(defined(@{$update_hash->{$distribution}->{$package}->{$version}}[3])) { + $set .= "section = '@{$update_hash->{$distribution}->{$package}->{$version}}[3]', "; + } + if(defined(@{$update_hash->{$distribution}->{$package}->{$version}}[4])) { + $set .= "description = '@{$update_hash->{$distribution}->{$package}->{$version}}[4]', "; + } + if(defined(@{$update_hash->{$distribution}->{$package}->{$version}}[5])) { + $set .= "template = '@{$update_hash->{$distribution}->{$package}->{$version}}[5]', "; + } + if(defined($set) and length($set) > 0) { + $set .= "timestamp = '$local_timestamp'"; + } else { + next; + } + push @new_statement_list, + "UPDATE $main::packages_list_tn SET $set WHERE" + ." distribution = '$distribution'" + ." AND package = '$package'" + ." AND version = '$version'"; + } + } + } - return; + @packages_list_statements = @new_statement_list; } @@ -2139,7 +2345,6 @@ sub parse_package_info { parse_package( "$outdir/$dist/$section", $dist, $path, $session_id ); } - find(\&cleanup_and_extract, keys( %repo_dirs )); } @@ -2167,7 +2372,6 @@ sub parse_package { my ($path, $dist, $srv_path, $session_id)= @_; if (not defined $session_id) { $session_id = 0;} my ($package, $version, $section, $description); - my @sql_list; my $PACKAGES; my $timestamp = &get_time(); @@ -2190,8 +2394,8 @@ sub parse_package { # Use empty lines as a trigger if ($line =~ /^\s*$/){ - my $sql = "INSERT INTO packages_list VALUES ('$dist', '$package', '$version', '$section', '', 'none', '$timestamp')"; - push(@sql_list, $sql); + my $sql = "INSERT INTO packages_list VALUES ('$dist', '$package', '$version', '$section', '$description', '', '$timestamp')"; + push(@packages_list_statements, $sql); $package = "none"; $version = "none"; $section = "none"; @@ -2213,7 +2417,7 @@ sub parse_package { # Trigger for description if ($line =~ /^Description:\s/){ - ($description)= ($line =~ /^Description: (.*)$/); + ($description)= &encode_base64(($line =~ /^Description: (.*)$/)); next; } @@ -2234,9 +2438,6 @@ sub parse_package { close( $PACKAGES ); unlink( "$path.in" ); &main::daemon_log("$session_id DEBUG: unlink '$path.in'", 1); - my $len_sql_list = @sql_list; - &main::daemon_log("$session_id DEBUG: add $len_sql_list insert-statements to packages_list_db", 5); - $packages_list_db->exec_statementlist(\@sql_list); } @@ -2266,26 +2467,22 @@ sub cleanup_and_extract { mkpath($dir); system( "dpkg -e '$File::Find::name' '$dir/DEBIAN'" ); - if( -f "$dir/DEBIAN/templates" ) { - - daemon_log("DEBUG: Found debconf templates in '$package' - $newver", 5); - - my $tmpl= ""; - { - local $/=undef; - open FILE, "$dir/DEBIAN/templates"; - $tmpl = &encode_base64(); - close FILE; - } - rmtree("$dir/DEBIAN/templates"); + if( -f "$dir/DEBIAN/templates" ) { - $sql= "update $main::packages_list_tn set template = '$tmpl' where package = '$package' and version = '$newver';"; + daemon_log("DEBUG: Found debconf templates in '$package' - $newver", 5); - } else { - $sql= "update $main::packages_list_tn set template = '' where package = '$package' and version = '$newver';"; - } + my $tmpl= ""; + { + local $/=undef; + open FILE, "$dir/DEBIAN/templates"; + $tmpl = &encode_base64(); + close FILE; + } + rmtree("$dir/DEBIAN/templates"); - my $res= $main::packages_list_db->update_dbentry($sql); + $sql= "update $main::packages_list_tn set template = '$tmpl' where package = '$package' and version = '$newver';"; + push @packages_list_statements, $sql; + } } return; @@ -2337,8 +2534,23 @@ if( 0 != $pid ) { }; } +# parse head url and revision from svn +my $server_status_hash = { 'developmental'=>'revision', 'stable'=>'release'}; +$server_version =~ /^\$HeadURL: (\S+) \$:\$Rev: (\d+) \$$/; +$server_headURL = defined $1 ? $1 : 'unknown' ; +$server_revision = defined $2 ? $2 : 'unknown' ; +if ($server_headURL =~ /\/tag\// || + $server_headURL =~ /\/branches\// ) { + $server_status = "stable"; +} else { + $server_status = "developmental" ; +} + + daemon_log(" ", 1); daemon_log("$0 started!", 1); +daemon_log("status: $server_status", 1); +daemon_log($server_status_hash->{$server_status}.": $server_revision", 1); if ($no_bus > 0) { $bus_activ = "false" @@ -2370,7 +2582,8 @@ $fai_release_db = GOSA::DBsqlite->new($fai_release_file_name); $fai_release_db->create_table($fai_release_tn, \@fai_release_col_names); # connect to packages_list_db -unlink($packages_list_file_name); +#unlink($packages_list_file_name); +unlink($packages_list_under_construction); $packages_list_db = GOSA::DBsqlite->new($packages_list_file_name); $packages_list_db->create_table($packages_list_tn, \@packages_list_col_names); @@ -2408,6 +2621,7 @@ POE::Session->create( _start => \&_start, sig_handler => \&sig_handler, watch_for_new_messages => \&watch_for_new_messages, + watch_for_delivery_messages => \&watch_for_delivery_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,