From: rettenbe <rettenbe@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Wed, 16 Apr 2008 11:24:56 +0000 (+0000)
Subject: no 120 sec waiting of installing jobs in job queue
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ee19597cbd6e193adde98bde1a693927c271791f;p=gosa.git

no 120 sec waiting of installing jobs in job queue


git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@10501 594d385d-05f5-0310-b6e9-bd551577e9d8
---

diff --git a/gosa-si/gosa-si-server b/gosa-si/gosa-si-server
index f9d18b5b1..1e35f6b6b 100755
--- a/gosa-si/gosa-si-server
+++ b/gosa-si/gosa-si-server
@@ -1267,7 +1267,7 @@ sub watch_for_new_jobs {
 
 	# 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) + 120) < $timestamp ORDER BY timestamp";
+	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
@@ -1349,7 +1349,6 @@ sub watch_for_new_messages {
     
     # check messaging_db for new incoming messages with executable timestamp
     my $timestamp = &get_time();
-    #my $sql_statement = "SELECT * FROM $messaging_tn WHERE (CAST (delivery_time AS INTEGER) + 120) < $timestamp";
     my $sql_statement = "SELECT * FROM $messaging_tn WHERE ( (CAST(timestamp AS INTEGER))<$timestamp AND flag='n' AND direction='in' )";
     my $res = $messaging_db->exec_statement( $sql_statement );