X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-si%2Fgosa-si-server;h=a3fd41505f83ce0b2fa6eb197ce7ae6eb01e73de;hb=32638968fe24c782eb404931b168c8130733b651;hp=ed79c73495ab842306bae855ca8ef905f2b0dfb4;hpb=172954adfb5d6738189db3f09e92943bf451797c;p=gosa.git diff --git a/gosa-si/gosa-si-server b/gosa-si/gosa-si-server index ed79c7349..a3fd41505 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); @@ -105,8 +106,8 @@ $ping_timeout = 5; $no_bus = 0; $bus_activ = "true"; - $no_arp = 0; +my $packages_list_under_construction = 0; our $prg= basename($0); @@ -114,55 +115,60 @@ our $prg= basename($0); our $job_db; our $job_queue_tn = 'jobs'; my $job_queue_file_name; -my @job_queue_col_names = ("id INTEGER", - "timestamp", +my @job_queue_col_names = ("id INTEGER PRIMARY KEY", + "timestamp DEFAULT 'none'", "status DEFAULT 'none'", "result DEFAULT 'none'", "progress DEFAULT 'none'", - "headertag DEFAULT 'none'", + "headertag DEFAULT 'none'", "targettag DEFAULT 'none'", "xmlmessage DEFAULT 'none'", "macaddress DEFAULT 'none'", + "plainname DEFAULT 'none'", ); # holds all other gosa-sd as well as the gosa-sd-bus our $known_server_db; our $known_server_tn = "known_server"; my $known_server_file_name; -my @known_server_col_names = ('hostname', 'status', 'hostkey', 'timestamp'); +my @known_server_col_names = ("hostname", "status", "hostkey", "timestamp"); # holds all registrated clients our $known_clients_db; our $known_clients_tn = "known_clients"; my $known_clients_file_name; -my @known_clients_col_names = ('hostname', 'status', 'hostkey', 'timestamp', 'macaddress', 'events'); +my @known_clients_col_names = ("hostname", "status", "hostkey", "timestamp", "macaddress", "events"); # holds all logged in user at each client our $login_users_db; our $login_users_tn = "login_users"; my $login_users_file_name; -my @login_users_col_names = ('client', 'user', 'timestamp'); +my @login_users_col_names = ("client", "user", "timestamp"); # holds all fai server, the debian release and tag our $fai_server_db; our $fai_server_tn = "fai_server"; my $fai_server_file_name; -our @fai_server_col_names = ('timestamp', 'server', 'release', 'sections', 'tag'); +our @fai_server_col_names = ("timestamp", "server", "release", "sections", "tag"); + +our $fai_release_db; our $fai_release_tn = "fai_release"; -our @fai_release_col_names = ('timestamp', 'release', 'class', 'type', 'state'); +my $fai_release_file_name; +our @fai_release_col_names = ("timestamp", "release", "class", "type", "state"); # holds all packages available from different repositories our $packages_list_db; our $packages_list_tn = "packages_list"; my $packages_list_file_name; -our @packages_list_col_names = ('distribution', 'package', 'version', 'section', 'description', 'template', 'timestamp'); +our @packages_list_col_names = ("distribution", "package", "version", "section", "description", "template", "timestamp"); my $outdir = "/tmp/packages_list_db"; 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 = ("id INTEGER", "subject", "message_from", "message_to", + "flag", "direction", "delivery_time", "message", "timestamp" ); my $messaging_file_name; # path to directory to store client install log files @@ -186,7 +192,8 @@ my $max_children = 2; "known-clients" => [\$known_clients_file_name, '/var/lib/gosa-si/clients.db' ], "known-servers" => [\$known_server_file_name, '/var/lib/gosa-si/servers.db'], "login-users" => [\$login_users_file_name, '/var/lib/gosa-si/users.db'], - "fai-server" => [\$fai_server_file_name, '/var/lib/gosa-si/fai.db'], + "fai-server" => [\$fai_server_file_name, '/var/lib/gosa-si/fai_server.db'], + "fai-release" => [\$fai_release_file_name, '/var/lib/gosa-si/fai_release.db'], "packages-list" => [\$packages_list_file_name, '/var/lib/gosa-si/packages.db'], "messaging" => [\$messaging_file_name, '/var/lib/gosa-si/messaging.db'], "source-list" => [\$sources_list, '/etc/apt/sources.list'], @@ -203,6 +210,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 +249,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 { @@ -278,6 +286,7 @@ sub daemon_log { print STDERR "cannot open $log_file: $!"; return } chomp($msg); + $msg =~s/\n//g; # no newlines are allowed in log messages, this is important for later log parsing if($level <= $verbose){ my ($seconds, $minutes, $hours, $monthday, $month, $year, $weekday, $yearday, $sommertime) = localtime(time); @@ -1039,7 +1048,7 @@ sub process_task { daemon_log("", 5); daemon_log("$session_id INFO: Incoming msg with session ID $session_id from '".$heap->{'remote_ip'}."'", 5); - daemon_log("$session_id DEBUG: Incoming msg:\n$input", 9); + #daemon_log("$session_id DEBUG: Incoming msg:\n$input", 9); #################### # check incoming msg @@ -1081,7 +1090,10 @@ sub process_task { if ( 0 < @{$answer_l} ) { my $answer_str = join("\n", @{$answer_l}); daemon_log("$session_id DEBUG: $module: Got answer from module: \n".$answer_str,8); + } else { + daemon_log("$session_id DEBUG: $module: Got no answer from module!" ,8); } + } if( !$answer_l ) { $error++ }; @@ -1235,6 +1247,8 @@ 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); } sub watch_for_done_jobs { @@ -1258,7 +1272,7 @@ sub watch_for_new_jobs { # 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 $sql_statement = "SELECT * FROM $job_queue_tn WHERE status='waiting' AND (CAST (timestamp AS INTEGER)) < $timestamp ORDER BY timestamp"; my $res = $job_db->exec_statement( $sql_statement ); # Merge all new jobs that would do the same actions @@ -1334,12 +1348,93 @@ sub watch_for_new_jobs { } +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 $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}[3]; + + # translate message_to to plain login name +# TODO implement reciever translation + my @reciever_l = ($message_to); + my $message_id = @{$hit}[0]; + + #add each outgoing msg to messaging_db + my $reciever; + foreach $reciever (@reciever_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 + "none"."', '". # flag + "out"."', '". # direction + @{$hit}[6]."', '". # delivery_time + @{$hit}[7]."', '". # message + $timestamp."'". # timestamp + ")"; + &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); + } + + # 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_done_messages { + my ($kernel,$heap) = @_[KERNEL, HEAP]; + + $kernel->delay_set('watch_for_done_messages', $messaging_db_loop_delay); + return; +} + + sub get_ldap_handle { my ($session_id) = @_; my $heap; my $ldap_handle; if (not defined $session_id ) { $session_id = 0 }; + if ($session_id =~ /[^0-9]*/) { $session_id = 0 }; if ($session_id == 0) { daemon_log("$session_id DEBUG: get_ldap_handle invoked without a session_id, create a new ldap_handle", 7); @@ -1511,12 +1606,29 @@ sub change_goto_state { } +sub run_create_fai_server_db { + my ($kernel, $session, $heap, $table_name) = @_[KERNEL, SESSION, HEAP, ARG0]; + my $session_id = $session->ID; + my $task = POE::Wheel::Run->new( + Program => sub { &create_fai_server_db($table_name,$kernel, undef, $session_id) }, + StdoutEvent => "session_run_result", + StderrEvent => "session_run_debug", + CloseEvent => "session_run_done", + ); + + $heap->{task}->{ $task->ID } = $task; + return; +} + + sub create_fai_server_db { - my ($table_name, $kernel) = @_; + my ($table_name, $kernel, $dont_create_packages_list, $session_id) = @_; my $result; + + if (not defined $session_id) { $session_id = 0; } my $ldap_handle = &get_ldap_handle(); if(defined($ldap_handle)) { - daemon_log("INFO: create_fai_server_db: start", 5); + daemon_log("$session_id INFO: create_fai_server_db: start", 5); my $mesg= $ldap_handle->search( base => $ldap_base, scope => 'sub', @@ -1543,20 +1655,24 @@ sub create_fai_server_db { } } } - daemon_log("INFO: create_fai_server_db: finished", 5); + daemon_log("$session_id INFO: create_fai_server_db: finished", 5); # TODO: Find a way to post the 'create_packages_list_db' event - &create_packages_list_db($ldap_handle); + if(not defined($dont_create_packages_list)) { + &create_packages_list_db(undef, undef, $session_id); + } } $ldap_handle->disconnect; return $result; } -sub run_create_fai_server_db { - my ($kernel, $session, $heap, $table_name) = @_[KERNEL, SESSION, HEAP, ARG0]; + +sub run_create_fai_release_db { + my ($session, $heap, $table_name) = @_[SESSION, HEAP, ARG0]; + my $session_id = $session->ID; my $task = POE::Wheel::Run->new( - Program => sub { &create_fai_server_db($table_name,$kernel) }, + Program => sub { &create_fai_release_db($table_name, $session_id) }, StdoutEvent => "session_run_result", StderrEvent => "session_run_debug", CloseEvent => "session_run_done", @@ -1568,12 +1684,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', @@ -1586,7 +1705,7 @@ sub create_fai_release_db { my @sql_list; my $timestamp= &get_time(); foreach my $ou (@{$mesg->{entries}}) { - my $tmp_classes= resolve_fai_classes($ou->dn, $ldap_handle); + my $tmp_classes= resolve_fai_classes($ou->dn, $ldap_handle, $session_id); if(defined($tmp_classes) && ref($tmp_classes) eq 'HASH') { my @tmp_array=get_fai_release_entries($tmp_classes); if(@tmp_array) { @@ -1606,30 +1725,19 @@ 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",8); if(@sql_list) { - unshift @sql_list, "DELETE FROM $table_name"; - $fai_server_db->exec_statementlist(\@sql_list); + unshift @sql_list, "DELETE FROM $table_name"; # at first, clear db + $fai_release_db->exec_statementlist(\@sql_list); } - daemon_log("DEBUG: Done with inserting",6); + daemon_log("$session_id DEBUG: Done with inserting",7); } - 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; } -sub run_create_fai_release_db { - my ($session, $heap, $table_name) = @_[SESSION, HEAP, ARG0]; - my $task = POE::Wheel::Run->new( - Program => sub { &create_fai_release_db($table_name) }, - StdoutEvent => "session_run_result", - StderrEvent => "session_run_debug", - CloseEvent => "session_run_done", - ); - - $heap->{task}->{ $task->ID } = $task; - return; -} sub get_fai_types { my $tmp_classes = shift || return undef; @@ -1665,20 +1773,21 @@ sub get_fai_state { } sub resolve_fai_classes { - my ($fai_base, $ldap_handle) = @_; + my ($fai_base, $ldap_handle, $session_id) = @_; + if (not defined $session_id) { $session_id = 0; } my $result; my @possible_fai_classes= ("FAIscript", "FAIhook", "FAIpartitionTable", "FAItemplate", "FAIvariable", "FAIprofile", "FAIpackageList"); my $fai_filter= "(|(&(objectClass=FAIclass)(|(objectClass=".join(")(objectClass=", @possible_fai_classes).")))(objectClass=FAIbranch))"; my $fai_classes; - daemon_log("DEBUG: Searching for FAI entries in base $fai_base",6); + daemon_log("$session_id DEBUG: Searching for FAI entries in base $fai_base",7); my $mesg= $ldap_handle->search( base => $fai_base, scope => 'sub', attrs => ['cn','objectClass','FAIstate'], filter => $fai_filter, ); - daemon_log("DEBUG: Found ".$mesg->count()." FAI entries",6); + daemon_log("$session_id DEBUG: Found ".$mesg->count()." FAI entries",7); if($mesg->{'resultCode'} == 0 && $mesg->count != 0) { @@ -1870,16 +1979,22 @@ sub session_run_done { } sub create_sources_list { - my ($ldap_handle) = @_; + my ($session_id) = @_; + my $ldap_handle = &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); } my $fh; - open($fh, ">$result") or return undef; + 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) { my $mesg=$ldap_handle->search( base => $ldap_server_dn, @@ -1889,40 +2004,75 @@ 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"; + } } } - } + } else { + &main::daemon_log("$session_id ERROR: something wrong with ldap_server_dn '$ldap_server_dn', abort create_soureces_list", 1); + } close($fh); return $result; } + +sub run_create_packages_list_db { + my ($session, $heap) = @_[SESSION, HEAP]; + my $session_id = $session->ID; + + my $task = POE::Wheel::Run->new( + Program => sub {&create_packages_list_db(undef, undef, $session_id)}, + StdoutEvent => "session_run_result", + StderrEvent => "session_run_debug", + CloseEvent => "session_run_done", + ); + $heap->{task}->{ $task->ID } = $task; +} + + sub create_packages_list_db { - my ($ldap_handle, $sources_file) = @_ ; + my ($ldap_handle, $sources_file, $session_id) = @_; + if (not defined $session_id) { $session_id = 0; } 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); + daemon_log("$session_id ERROR: no ldap_handle available to create_packages_list_db", 1); return; } } - if (not defined $sources_file) { - $sources_file = &create_sources_list($ldap_handle); + &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); + } - my $line; - daemon_log("INFO: create_packages_list_db: start", 5); + # 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; + } + my $line; open(CONFIG, "<$sources_file") or do { - daemon_log( "ERROR: create_packages_list_db: Failed to open '$sources_file'", 1); + daemon_log( "$session_id ERROR: create_packages_list_db: Failed to open '$sources_file'", 1); return; }; @@ -1946,45 +2096,40 @@ sub create_packages_list_db { my( $baseurl, $dist, $sections ) = ($line =~ /^deb\s([^\s]+)\s+([^\s]+)\s+(.*)$/); my $section; foreach $section (split(' ', $sections)){ - &parse_package_info( $baseurl, $dist, $section ); + &parse_package_info( $baseurl, $dist, $section, $session_id ); } } } close (CONFIG); - daemon_log("INFO: create_packages_list_db: finished", 5); + daemon_log("$session_id INFO: create_packages_list_db: finished", 5); + # set packages_list_under_construction to false + $packages_list_under_construction = 0; + return; } -sub run_create_packages_list_db { - my ($session, $heap) = @_[SESSION, HEAP]; - my $task = POE::Wheel::Run->new( - 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 { - my ($baseurl, $dist, $section)= @_; + my ($baseurl, $dist, $section, $session_id)= @_; my ($package); - + if (not defined $session_id) { $session_id = 0; } my ($path) = ($baseurl =~ m%://[^/]*(.*)$%); $repo_dirs{ "${repo_path}/pool" } = 1; foreach $package ("Packages.gz"){ - daemon_log("DEBUG: create_packages_list: fetch $baseurl, $dist, $section", 7); - get_package( "$baseurl/dists/$dist/$section/binary-$arch/$package", "$outdir/$dist/$section" ); - parse_package( "$outdir/$dist/$section", $dist, $path ); + daemon_log("$session_id DEBUG: create_packages_list: fetch $baseurl, $dist, $section", 7); + get_package( "$baseurl/dists/$dist/$section/binary-$arch/$package", "$outdir/$dist/$section", $session_id ); + parse_package( "$outdir/$dist/$section", $dist, $path, $session_id ); } - find(\&cleanup_and_extract, keys( %repo_dirs ) ); + find(\&cleanup_and_extract($session_id), keys( %repo_dirs )); } + sub get_package { - my ($url, $dest)= @_; + my ($url, $dest, $session_id)= @_; + if (not defined $session_id) { $session_id = 0; } my $tpath = dirname($dest); -d "$tpath" || mkpath "$tpath"; @@ -1992,27 +2137,30 @@ sub get_package { # This is ugly, but I've no time to take a look at "how it works in perl" if(0 == system("wget '$url' -O '$dest' 2>/dev/null") ) { system("gunzip -cd '$dest' > '$dest.in'"); + daemon_log("$session_id DEBUG: run command: gunzip -cd '$dest' > '$dest.in'", 5); unlink($dest); + daemon_log("$session_id DEBUG: delete file '$dest'", 5); } else { - daemon_log("ERROR: create_packages_list_db: get_packages: fetching '$url' failed!", 1); + daemon_log("$session_id ERROR: create_packages_list_db: get_packages: fetching '$url' failed!", 1); } return 0; } sub parse_package { - my ($path, $dist, $srv_path)= @_; + 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; if(not stat("$path.in")) { - daemon_log("ERROR: create_packages_list: parse_package: file '$path.in' is not readable",1); + daemon_log("$session_id ERROR: create_packages_list: parse_package: file '$path.in' is not readable",1); return; } open($PACKAGES, "<$path.in"); if(not defined($PACKAGES)) { - daemon_log("ERROR: create_packages_list_db: parse_package: can not open '$path.in'",1); + daemon_log("$session_id ERROR: create_packages_list_db: parse_package: cannot open '$path.in'",1); return; } @@ -2066,8 +2214,10 @@ sub parse_package { } close( $PACKAGES ); - unlink( "$path.in" ); - +# 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); } @@ -2084,39 +2234,41 @@ sub store_fileinfo { } sub cleanup_and_extract { - my $fileinfo = $repo_files{ $File::Find::name }; + my ($session_id) = @_; + if (not defined $session_id) { $session_id = 0; } + my $fileinfo = $repo_files{ $File::Find::name }; - if( defined $fileinfo ) { + if( defined $fileinfo ) { - my $dir = "$outdir/$fileinfo->{ 'dist' }/debconf.d"; - my $sql; - my $package = $fileinfo->{ 'package' }; - my $newver = $fileinfo->{ 'version' }; + my $dir = "$outdir/$fileinfo->{ 'dist' }/debconf.d"; + my $sql; + my $package = $fileinfo->{ 'package' }; + my $newver = $fileinfo->{ 'version' }; - mkpath($dir); - system( "dpkg -e '$File::Find::name' '$dir/DEBIAN'" ); + mkpath($dir); + system( "dpkg -e '$File::Find::name' '$dir/DEBIAN'" ); - if( -f "$dir/DEBIAN/templates" ) { + if( -f "$dir/DEBIAN/templates" ) { - daemon_log("DEBUG: Found debconf templates in '$package' - $newver", 5); + daemon_log("$session_id 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"); + my $tmpl= ""; + { + local $/=undef; + open FILE, "$dir/DEBIAN/templates"; + $tmpl = &encode_base64(); + close FILE; + } + rmtree("$dir/DEBIAN/templates"); - $sql= "update $main::packages_list_tn set template = '$tmpl' where package = '$package' and version = '$newver';"; + $sql= "update $main::packages_list_tn set template = '$tmpl' where package = '$package' and version = '$newver';"; - } else { - $sql= "update $main::packages_list_tn set template = '' where package = '$package' and version = '$newver';"; - } + } else { + $sql= "update $main::packages_list_tn set template = '' where package = '$package' and version = '$newver';"; + } - my $res= $main::packages_list_db->update_dbentry($sql); - } + my $res= $main::packages_list_db->update_dbentry($sql); + } } @@ -2189,9 +2341,13 @@ $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); + +unlink($fai_release_file_name); +$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); @@ -2231,6 +2387,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,