Merge pull request #262 from tripal/fix-progress

Check if we have queue items first
tripal · Apr 1, 2019 · 46d5799 · 46d5799
2 parents dd9ffe6 + 2871c88
commit 46d5799
Showing 1 changed file with 16 additions and 7 deletions.
diff --git a/includes/Elasticsearch/ESQueue.php b/includes/Elasticsearch/ESQueue.php
@@ -1,6 +1,6 @@
 <?php
 
-class ESQueue{
+class ESQueue {
 
   /**
    * Name of the queue progress table.
@@ -54,7 +54,15 @@ public function __construct() {
    * @return object
    */
   public static function progress() {
-    $query = 'SELECT index_name,
+    $should_check = (int) db_query("SELECT COUNT(*) 
+                                    FROM queue 
+                                    WHERE name LIKE :es", [
+      ':es' => db_like('elasticsearch').'%',
+    ])->fetchField();
+
+    $queues = [];
+    if ($should_check) {
+      $query = 'SELECT index_name,
                     priority,
                     SUM(total) AS total,
                     SUM(completed) AS completed,
@@ -63,7 +71,8 @@ public static function progress() {
                     FROM {' . self::QUEUE_TABLE . '}
                     GROUP BY index_name, priority
                     ORDER BY index_name ASC, priority ASC';
-    $queues = db_query($query)->fetchAll();
+      $queues = db_query($query)->fetchAll();
+    }
 
     $progress = [];
     $total = 0;
@@ -76,7 +85,7 @@ public static function progress() {
         continue;
       }
 
-      if($queue->completed > $queue->total) {
+      if ($queue->completed > $queue->total) {
         static::fixProgress($queue);
       }
 
@@ -100,7 +109,7 @@ public static function progress() {
         'last_run_at' => $last_run,
         'started_at' => $started_at,
         'time' => $queue->last_run_at - $queue->started_at,
-        'priority' => $queue->priority
+        'priority' => $queue->priority,
       ];
     }
 
@@ -117,7 +126,7 @@ public static function progress() {
   public static function fixProgress(&$queue) {
     $queue->completed = $queue->total;
 
-    db_query('UPDATE {'.self::QUEUE_TABLE.'} SET completed=total WHERE completed > total');
+    db_query('UPDATE {' . self::QUEUE_TABLE . '} SET completed=total WHERE completed > total');
   }
 
   /**
@@ -301,4 +310,4 @@ protected function generateQueueCount() {
       }
     }
   }
-}
+}