diff --git a/gosa-si/gosa-si-server b/gosa-si/gosa-si-server
index 0f3b33c9e8a1d184cf111b9d48064b50ef0687e0..872d8dd742cbd0446321fd9cffdee0617f358c5d 100755 (executable)
--- a/gosa-si/gosa-si-server
+++ b/gosa-si/gosa-si-server
$bus_activ = "true";
$no_arp = 0;
my $packages_list_under_construction = 0;
$bus_activ = "true";
$no_arp = 0;
my $packages_list_under_construction = 0;
+my $watch_for_new_jobs_in_progress = 0;
our $prg= basename($0);
our $prg= basename($0);
}
sub watch_for_new_jobs {
}
sub watch_for_new_jobs {
- my ($kernel,$heap) = @_[KERNEL, HEAP];
-
- # 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)) < $timestamp ORDER BY timestamp";
- my $res = $job_db->exec_statement( $sql_statement );
-
- # Merge all new jobs that would do the same actions
- my @drops;
- my $hits;
- foreach my $hit (reverse @{$res} ) {
- my $macaddress= lc @{$hit}[8];
- my $headertag= @{$hit}[5];
- if(
- defined($hits->{$macaddress}) &&
- defined($hits->{$macaddress}->{$headertag}) &&
- defined($hits->{$macaddress}->{$headertag}[0])
- ) {
- push @drops, "DELETE FROM $job_queue_tn WHERE id = '$hits->{$macaddress}->{$headertag}[0]'";
+ if($watch_for_new_jobs_in_progress == 0) {
+ $watch_for_new_jobs_in_progress = 1;
+ my ($kernel,$heap) = @_[KERNEL, HEAP];
+
+ # 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)) < $timestamp ORDER BY timestamp";
+ my $res = $job_db->exec_statement( $sql_statement );
+
+ # Merge all new jobs that would do the same actions
+ my @drops;
+ my $hits;
+ foreach my $hit (reverse @{$res} ) {
+ my $macaddress= lc @{$hit}[8];
+ my $headertag= @{$hit}[5];
+ if(
+ defined($hits->{$macaddress}) &&
+ defined($hits->{$macaddress}->{$headertag}) &&
+ defined($hits->{$macaddress}->{$headertag}[0])
+ ) {
+ push @drops, "DELETE FROM $job_queue_tn WHERE id = '$hits->{$macaddress}->{$headertag}[0]'";
+ }
+ $hits->{$macaddress}->{$headertag}= $hit;
}
}
- $hits->{$macaddress}->{$headertag}= $hit;
- }
- # Delete new jobs with a matching job in state 'processing'
- foreach my $macaddress (keys %{$hits}) {
- foreach my $jobdb_headertag (keys %{$hits->{$macaddress}}) {
- my $jobdb_id = @{$hits->{$macaddress}->{$jobdb_headertag}}[0];
- if(defined($job_db_id)) {
- 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'";
+ # Delete new jobs with a matching job in state 'processing'
+ foreach my $macaddress (keys %{$hits}) {
+ foreach my $jobdb_headertag (keys %{$hits->{$macaddress}}) {
+ my $jobdb_id = @{$hits->{$macaddress}->{$jobdb_headertag}}[0];
+ if(defined($jobdb_id)) {
+ 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'";
+ }
+ } else {
+ daemon_log("J ERROR: Job without id exists for macaddress $macaddress!", 1);
}
}
- } else {
- daemon_log("J ERROR: Job without id exists for macaddress $macaddress!", 1);
}
}
}
}
- }
- # Commit deletion
- $job_db->exec_statementlist(\@drops);
+ # Commit deletion
+ $job_db->exec_statementlist(\@drops);
- # Look for new jobs that could be executed
- foreach my $macaddress (keys %{$hits}) {
+ # Look for new jobs that could be executed
+ foreach my $macaddress (keys %{$hits}) {
- # Look if there is an executing job
- my $sql_statement = "SELECT * FROM $job_queue_tn WHERE macaddress LIKE '$macaddress' AND status='processing'";
- my $res = $job_db->exec_statement( $sql_statement );
+ # Look if there is an executing job
+ my $sql_statement = "SELECT * FROM $job_queue_tn WHERE macaddress LIKE '$macaddress' AND status='processing'";
+ my $res = $job_db->exec_statement( $sql_statement );
- # Skip new jobs for host if there is a processing job
- if(defined($res) and defined @{$res}[0]) {
- next;
- }
+ # Skip new jobs for host if there is a processing job
+ if(defined($res) and defined @{$res}[0]) {
+ next;
+ }
- foreach my $jobdb_headertag (keys %{$hits->{$macaddress}}) {
- my $jobdb_id = @{$hits->{$macaddress}->{$jobdb_headertag}}[0];
- my $job_msg = @{$hits->{$macaddress}->{$jobdb_headertag}}[7];
+ foreach my $jobdb_headertag (keys %{$hits->{$macaddress}}) {
+ my $jobdb_id = @{$hits->{$macaddress}->{$jobdb_headertag}}[0];
+ if(defined($jobdb_id)) {
+ my $job_msg = @{$hits->{$macaddress}->{$jobdb_headertag}}[7];
- daemon_log("J DEBUG: its time to execute $job_msg", 7);
- my $sql_statement = "SELECT * FROM known_clients WHERE macaddress LIKE '$macaddress'";
- my $res_hash = $known_clients_db->select_dbentry( $sql_statement );
+ daemon_log("J DEBUG: its time to execute $job_msg", 7);
+ my $sql_statement = "SELECT * FROM known_clients WHERE macaddress LIKE '$macaddress'";
+ my $res_hash = $known_clients_db->select_dbentry( $sql_statement );
- # expect macaddress is unique!!!!!!
- my $target = $res_hash->{1}->{hostname};
+ # expect macaddress is unique!!!!!!
+ my $target = $res_hash->{1}->{hostname};
- # change header
- $job_msg =~ s/<header>job_/<header>gosa_/;
+ # change header
+ $job_msg =~ s/<header>job_/<header>gosa_/;
- # add sqlite_id
- $job_msg =~ s/<\/xml>$/<jobdb_id>$jobdb_id<\/jobdb_id><\/xml>/;
+ # add sqlite_id
+ $job_msg =~ s/<\/xml>$/<jobdb_id>$jobdb_id<\/jobdb_id><\/xml>/;
- $job_msg =~ /<header>(\S+)<\/header>/;
- my $header = $1 ;
- my $func_error = &send_msg_to_target($job_msg, $server_address, $GosaPackages_key, $header, "J");
+ $job_msg =~ /<header>(\S+)<\/header>/;
+ my $header = $1 ;
+ 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'";
- my $res = $job_db->update_dbentry($sql_statement);
+ # update status in job queue to 'processing'
+ $sql_statement = "UPDATE $job_queue_tn SET status='processing' WHERE id='$jobdb_id'";
+ my $res = $job_db->update_dbentry($sql_statement);
- # We don't want parallel processing
- last;
+ # We don't want parallel processing
+ last;
+ }
+ }
}
}
- }
- $kernel->delay_set('watch_for_new_jobs', $job_queue_loop_delay);
+ $watch_for_new_jobs_in_progress = 0;
+ $kernel->delay_set('watch_for_new_jobs', $job_queue_loop_delay);
+ }
}
}