index 58791e9769b804b28bbf909950b0e477ce873f3c..772955f122911d1ec279d508c37f70e678eccb36 100644 (file)
use warnings;
use GOSA::GosaSupportDaemon;
use IO::Socket::INET;
+use Socket;
use XML::Simple;
use File::Spec;
use Data::Dumper;
$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
sub import_events {
if (not -e $event_dir) {
- daemon_log("ERROR: cannot find directory or directory is not readable: $event_dir", 1);
+ &main::daemon_log("ERROR: cannot find directory or directory is not readable: $event_dir", 1);
}
opendir (DIR, $event_dir) or die "ERROR while loading gosa-si-events from directory $event_dir : $!\n";
while (defined (my $event = readdir (DIR))) {
- if( $event eq "." || $event eq ".." ) { next; }
+ if( $event eq "." || $event eq ".." ) { next; }
+ if( $event eq "siTriggered.pm" ) { next; } # only SI specific events
eval{ require $event; };
if( $@ ) {
foreach my $event_name (@{$events_l}) {
$event_hash->{$event_name} = $event_module;
}
-
+ my $events_string = join( ", ", @{$events_l});
+ &main::daemon_log("INFO: GosaPackages imported events $events_string", 5);
}
}
foreach my $out_msg ( @msg_l ) {
- # keep job queue uptodate and save result and status
- if (defined ($out_msg) && $out_msg =~ /<jobdb_id>(\d*?)<\/jobdb_id>/) {
+ # keep job queue up-to-date and save result and status
+ 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', result='".$out_msg.
- "' WHERE id='$job_id'";
+ my $sql = "UPDATE '".$main::job_queue_table_name."'".
+ " SET status='processing'".
+ " WHERE id='$job_id'";
my $res = $main::job_db->exec_statement($sql);
}
@out_msg_l = &update_status_jobdb_entry
} elsif ($header eq 'count_jobdb' ) {
@out_msg_l = &count_jobdb
-# } elsif ($header eq 'trigger_action_wake' ) {
-# # Forward messages to all known servers as "trigger_wake"
-# my $in_hash= &transform_msg2hash($msg);
-# my %data = ( 'macAddress' => \@{$in_hash->{macAddress}} );
-# @out_msg_l = &build_msg("trigger_wake", $server_address, "KNOWN_SERVER", \%data);
} else {
# msg could not be assigned to core function
# maybe it is an eventa
sub process_job_msg {
- my ($msg, $msg_hash)= @_ ;
+ my ($msg, $msg_hash, $session_id)= @_ ;
my $out_msg;
+ my $error = 0;
- my $header = @{$msg_hash->{header}}[0];
+ my $header = @{$msg_hash->{'header'}}[0];
$header =~ s/job_//;
+ # if no timestamp is specified, use 19700101000000
+ my $timestamp = "19700101000000";
+ if( exists $msg_hash->{'timestamp'} ) {
+ $timestamp = @{$msg_hash->{'timestamp'}}[0];
+ }
+
+ #if no macaddress is specified, raise error
+ my $macaddress;
+ if( exists $msg_hash->{'macaddress'} ) {
+ $macaddress = @{$msg_hash->{'macaddress'}}[0];
+ } else {
+ $error ++;
+ $out_msg = "<xml>".
+ "<header>answer</header>".
+ "<source>$server_address</source>".
+ "<target>GOSA</target>".
+ "<answer1>1</answer1>".
+ "<error_string>no mac address specified</error_string>".
+ "</xml>";
+ }
+
# check wether mac address is already known in known_daemons or known_clients
my $target = 'none';
- # add job to job queue
- my $func_dic = {table=>$main::job_queue_table_name,
- primkey=>'id',
- timestamp=>@{$msg_hash->{timestamp}}[0],
- status=>'waiting',
- result=>'none',
- headertag=>$header,
- targettag=>$target,
- xmlmessage=>$msg,
- macaddress=>@{$msg_hash->{mac}}[0],
- };
- my $res = $main::job_db->add_dbentry($func_dic);
- if (not $res == 0) {
- &main::daemon_log("ERROR: GosaPackages: process_job_msg: $res", 1);
- } else {
- &main::daemon_log("INFO: GosaPackages: $header job successfully added to job queue", 5);
+ if( $error == 0 ) {
+ # add job to job queue
+ my $func_dic = {table=>$main::job_queue_table_name,
+ primkey=>'id',
+ timestamp=>$timestamp,
+ status=>'waiting',
+ result=>'none',
+ progress=>'none',
+ headertag=>$header,
+ targettag=>$target,
+ xmlmessage=>$msg,
+ macaddress=>$macaddress,
+ };
+
+ my $res = $main::job_db->add_dbentry($func_dic);
+ if (not $res == 0) {
+ &main::daemon_log("ERROR: GosaPackages: process_job_msg: $res", 1);
+ } else {
+ &main::daemon_log("INFO: GosaPackages: $header job successfully added to job queue", 5);
+ }
+ $out_msg = "<xml><header>answer</header><source>$server_address</source><target>GOSA</target><answer1>$res</answer1></xml>";
}
- $out_msg = "<xml><header>answer</header><source>$server_address</source><target>GOSA</target><answer1>$res</answer1></xml>";
my @out_msg_l = ( $out_msg );
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 $sql_statement = "UPDATE $table $update $where";
+print STDERR "================================================\n";
+print STDERR "$sql_statement\n";
# execute db query
my $db_res = $main::job_db->update_dbentry($sql_statement);
$out_xml = "<xml><header>answer</header><source>$server_address</source><target>GOSA</target><answer1>0</answer1></xml>";
}
my @out_msg_l = ( $out_xml );
+
+print STDERR $out_xml."\n";
+
return @out_msg_l;
}