index 8314850c7528de65485f44b2afd7b1c68e8e5f56..18879d691480d3e77f58dab54e3a148c4750b14b 100644 (file)
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";
$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
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;
}
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);
@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 ) {
if (defined ($out_msg) && $out_msg =~ /<jobdb_id>(\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);
}
timestamp=>$timestamp,
status=>'waiting',
result=>'none',
+ progress=>'none',
headertag=>$header,
targettag=>$target,
xmlmessage=>$msg,
}
-sub db_res_2_xml {
- my ($db_res) = @_ ;
- my $xml = "<xml><header>answer</header><source>$server_address</source><target>GOSA</target>";
-
- my $len_db_res= keys %{$db_res};
- for( my $i= 1; $i<= $len_db_res; $i++ ) {
- $xml .= "\n<answer$i>";
- 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 .= "</$column_name>";
- }
- $xml .= "</answer$i>";
-
- }
-
- $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);
# 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;
}
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 = "<answer1>1</answer1><error_string>there is no timestamp update allowed while status is 'processing'</error_string>";
+ }
- # 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 = "<xml><header>answer</header><source>$server_address</source><target>GOSA</target><answer1>0</answer1></xml>";
+ $out_xml = "<answer1>0</answer1>";
}
- my @out_msg_l = ( $out_xml );
-
-print STDERR $out_xml."\n";
-
+
+ my $out_msg = sprintf("<xml><header>answer</header><source>%s</source><target>GOSA</target>%s</xml>", $server_address, $out_xml);
+ my @out_msg_l = ( $out_msg );
return @out_msg_l;
}