X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-si%2Fmodules%2FGosaPackages.pm;h=18879d691480d3e77f58dab54e3a148c4750b14b;hb=7310e0e4833b082128261c277424fdb73a7e31f1;hp=8314850c7528de65485f44b2afd7b1c68e8e5f56;hpb=0e2de0eb04845891d90f6bf127224ac5110dcf1c;p=gosa.git diff --git a/gosa-si/modules/GosaPackages.pm b/gosa-si/modules/GosaPackages.pm index 8314850c7..18879d691 100644 --- a/gosa-si/modules/GosaPackages.pm +++ b/gosa-si/modules/GosaPackages.pm @@ -7,11 +7,13 @@ use strict; use warnings; use GOSA::GosaSupportDaemon; use IO::Socket::INET; +use Socket; use XML::Simple; use File::Spec; use Data::Dumper; use GOSA::DBsqlite; use MIME::Base64; +use utf8; my $event_dir = "/usr/lib/gosa-si/server/events"; use lib "/usr/lib/gosa-si/server/events"; @@ -50,7 +52,9 @@ $network_interface= &get_interface_for_ip($server_ip); $gosa_mac_address= &get_mac($network_interface); # complete addresses +if( inet_aton($server_ip) ){ $server_ip = inet_ntoa(inet_aton($server_ip)); } our $server_address = "$server_ip:$server_port"; +if( inet_aton($gosa_ip) ){ $gosa_ip = inet_ntoa(inet_aton($gosa_ip)); } my $gosa_address = "$gosa_ip:$gosa_port"; # create general settings for this module @@ -226,12 +230,13 @@ sub import_events { while (defined (my $event = readdir (DIR))) { if( $event eq "." || $event eq ".." ) { next; } - if( $event eq "siTriggered.pm" ) { next; } # only SI specific events + if( $event eq "siTriggered.pm" ) { next; } # SI specific events not needed in GosaPackages.pm + if( $event eq "clMessages.pm" ) { next; } # SI specific events not needed in GosaPackages.pm eval{ require $event; }; if( $@ ) { - &main::daemon_log("import of event module '$event' failed", 1); - &main::daemon_log("$@", 8); + &main::daemon_log("ERROR: import of event module '$event' failed", 1); + &main::daemon_log("$@", 1); next; } @@ -259,7 +264,7 @@ sub process_incoming_msg { my @msg_l; my @out_msg_l; - &main::daemon_log("GosaPackages: receive '$header'", 1); + &main::daemon_log("DEBUG: GosaPackages: receive '$header'", 8); if ($header =~ /^job_/) { @msg_l = &process_job_msg($msg, $msg_hash, $session_id); @@ -268,7 +273,7 @@ sub process_incoming_msg { @msg_l = &process_gosa_msg($msg, $msg_hash, $session_id); } else { - &main::daemon_log("ERROR: $header is not a valid GosaPackage-header, need a 'job_' or a 'gosa_' prefix"); + &main::daemon_log("ERROR: $header is not a valid GosaPackage-header, need a 'job_' or a 'gosa_' prefix", 1); } foreach my $out_msg ( @msg_l ) { @@ -277,7 +282,7 @@ sub process_incoming_msg { if (defined ($out_msg) && $out_msg =~ /(\d+)<\/jobdb_id>/) { my $job_id = $1; my $sql = "UPDATE '".$main::job_queue_table_name."'". - " SET status='done'". + " SET status='processing'". " WHERE id='$job_id'"; my $res = $main::job_db->exec_statement($sql); } @@ -375,6 +380,7 @@ sub process_job_msg { timestamp=>$timestamp, status=>'waiting', result=>'none', + progress=>'none', headertag=>$header, targettag=>$target, xmlmessage=>$msg, @@ -395,43 +401,18 @@ sub process_job_msg { } -sub db_res_2_xml { - my ($db_res) = @_ ; - my $xml = "
answer
$server_addressGOSA"; - - my $len_db_res= keys %{$db_res}; - for( my $i= 1; $i<= $len_db_res; $i++ ) { - $xml .= "\n"; - my $hash= $db_res->{$i}; - while ( my ($column_name, $column_value) = each %{$hash} ) { - $xml .= "<$column_name>"; - my $xml_content; - if( $column_name eq "xmlmessage" ) { - $xml_content = &encode_base64($column_value); - } else { - $xml_content = $column_value; - } - $xml .= $xml_content; - $xml .= ""; - } - $xml .= ""; - - } - - $xml .= ""; - return $xml; -} - ## CORE FUNCTIONS ############################################################ sub query_jobdb { my ($msg) = @_; my $msg_hash = &transform_msg2hash($msg); + my $target = @{$msg_hash->{'target'}}[0]; + my $source = @{$msg_hash->{'source'}}[0]; # prepare query sql statement my $select= &get_select_statement($msg, $msg_hash); - my $table= $main::job_queue_table_name; + my $table= $main::job_queue_tn; my $where= &get_where_statement($msg, $msg_hash); my $limit= &get_limit_statement($msg, $msg_hash); my $orderby= &get_orderby_statement($msg, $msg_hash); @@ -439,7 +420,8 @@ sub query_jobdb { # execute db query my $res_hash = $main::job_db->select_dbentry($sql_statement); - my $out_xml = &db_res_2_xml($res_hash); + my $out_xml = &db_res2si_msg($res_hash, "query_jobdb", $target, $source); + my @out_msg_l = ( $out_xml ); return @out_msg_l; } @@ -525,22 +507,31 @@ sub update_status_jobdb_entry { my $where= &get_where_statement($msg, $msg_hash); my $update= &get_update_statement($msg, $msg_hash); - my $sql_statement = "UPDATE $table $update $where"; + # conditions + # no timestamp update if status eq waiting + my $res_hash = $main::job_db->select_dbentry("SELECT * FROM $table $where AND status='processing' "); + if( (0 != keys(%$res_hash)) && ($update =~ /timestamp/i) ) { + $error ++; + $out_xml = "1there is no timestamp update allowed while status is 'processing'"; + } - # execute db query - my $db_res = $main::job_db->update_dbentry($sql_statement); + if( $error == 0 ) { + my $sql_statement = "UPDATE $table $update $where"; + # execute db query + my $db_res = $main::job_db->update_dbentry($sql_statement); - # check success of db update - if( not $db_res > 0 ) { $error++; }; + # check success of db update + if( not $db_res > 0 ) { $error++; }; + + } } if( $error == 0) { - $out_xml = "
answer
$server_addressGOSA0"; + $out_xml = "0"; } - my @out_msg_l = ( $out_xml ); - -print STDERR $out_xml."\n"; - + + my $out_msg = sprintf("
answer
%sGOSA%s", $server_address, $out_xml); + my @out_msg_l = ( $out_msg ); return @out_msg_l; }