diff --git a/gosa-si/gosa-si-server b/gosa-si/gosa-si-server
index b2dff82b4bb49d06a5e8171260ef6cd6aef5e527..612e01436e23a97e714b42aeff87bc46e63dad8d 100755 (executable)
--- a/gosa-si/gosa-si-server
+++ b/gosa-si/gosa-si-server
if (not $answer =~ /<header>trigger_action_reinstall<\/header>/) {
my $sql_statement = "UPDATE $job_queue_tn ".
"SET status='error', result='can not deliver msg, please consult log file' ".
if (not $answer =~ /<header>trigger_action_reinstall<\/header>/) {
my $sql_statement = "UPDATE $job_queue_tn ".
"SET status='error', result='can not deliver msg, please consult log file' ".
- "WHERE id='$jobdb_id'";
+ "WHERE id=$jobdb_id";
my $res = $job_db->update_dbentry($sql_statement);
}
my $res = $job_db->update_dbentry($sql_statement);
}
} else {
my $sql_statement = "UPDATE $job_queue_tn ".
"SET status='done' ".
} else {
my $sql_statement = "UPDATE $job_queue_tn ".
"SET status='done' ".
- "WHERE id='$jobdb_id' AND status='processed'";
+ "WHERE id=$jobdb_id AND status='processed'";
my $res = $job_db->update_dbentry($sql_statement);
}
}
my $res = $job_db->update_dbentry($sql_statement);
}
}
while( my ($id, $hit) = each %{$res} ) {
my $jobdb_id = $hit->{id};
while( my ($id, $hit) = each %{$res} ) {
my $jobdb_id = $hit->{id};
- my $sql_statement = "DELETE FROM $job_queue_tn WHERE id='$jobdb_id'";
- my $res = $job_db->del_dbentry($sql_statement);
+ my $sql_statement = "DELETE FROM $job_queue_tn WHERE id=$jobdb_id";
+ my $res = $job_db->del_dbentry($sql_statement);
}
$kernel->delay_set('watch_for_done_jobs',$job_queue_loop_delay);
}
$kernel->delay_set('watch_for_done_jobs',$job_queue_loop_delay);
defined($hits->{$macaddress}->{$headertag}) &&
defined($hits->{$macaddress}->{$headertag}[0])
) {
defined($hits->{$macaddress}->{$headertag}) &&
defined($hits->{$macaddress}->{$headertag}[0])
) {
- push @drops, "DELETE FROM $job_queue_tn WHERE id = '$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;
}
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}) {
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'";
+ 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);
my $func_error = &send_msg_to_target($job_msg, $server_address, $GosaPackages_key, $header, "J");
# update status in job queue to 'processing'
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'";
+ $sql_statement = "UPDATE $job_queue_tn SET status='processing' WHERE id=$jobdb_id";
my $res = $job_db->update_dbentry($sql_statement);
my $res = $job_db->update_dbentry($sql_statement);
+# TODO: abfangen ob alles in ordnung ist oder nicht, wenn nicht error schmeißen
# We don't want parallel processing
last;
# We don't want parallel processing
last;