(fix): Bad CQL; (chore): Style and logging

Core/Search/Delegates/DispatchIndexDelegate.php

@@ -50,19 +50,18 @@ class DispatchIndexDelegate
  public function index($entity)
  {
  try {
- $success = (bool) $this->searchIndex->index($entity);
+ $indexed = (bool) $this->searchIndex->index($entity);
  } catch (Exception $e) {
  error_log("[DispatchIndexDelegate] {$e}");
- $success = false;
+ $indexed = false;
  }
 
  $urn = (string) (new Urn($entity->guid));
 
- if ($success) {
+ if ($indexed) {
  $retryQueueEntry = new RetryQueueEntry();
  $retryQueueEntry
- ->setEntityUrn($urn)
- ->setLastRetry(time());
+ ->setEntityUrn($urn);
 
  $this->retryQueueRepository->delete($retryQueueEntry);
  } else {
@@ -73,15 +72,19 @@ class DispatchIndexDelegate
  ->setLastRetry(time())
  ->setRetries($retries);
 
- $this->retryQueueRepository->add($retryQueueEntry);
+ $retrySaved = $this->retryQueueRepository->add($retryQueueEntry);
+
+ if (!$retrySaved) {
+ error_log("[DispatchIndexDelegate] Critical: Cannot save retry to queue table: {$urn}");
+ } elseif ($retries < 5) {
+ error_log("[DispatchIndexDelegate] Warn: Re-queue: {$urn}");
 
- if ($retries < 5) {
  $this->eventsDispatcher->trigger('search:index', 'all', [
  'entity' => $entity
  ]);
  }
  }
 
- return $success;
+ return $indexed;
  }
 }

Core/Search/RetryQueue/Repository.php

@@ -116,14 +116,14 @@ class Repository
  public function add(RetryQueueEntry $retryQueueEntry)
  {
  if (!$retryQueueEntry->getEntityUrn()) {
- throw new \Exception('Missing URN');
+ throw new Exception('Missing URN');
  }
 
- $cql = "INSERT INTO search_dispatcher_queue (entity_urn, last_retry, retries) VALUES (?, ?, ?,)";
+ $cql = "INSERT INTO search_dispatcher_queue (entity_urn, last_retry, retries) VALUES (?, ?, ?)";
  $values = [
  (string) $retryQueueEntry->getEntityUrn(),
-  new Timestamp($retryQueueEntry->getLastRetry()),
-  (int) $retryQueueEntry->getRetries(),
+ new Timestamp($retryQueueEntry->getLastRetry()),
+ (int) $retryQueueEntry->getRetries(),
  ];
 
  $prepared = new Custom();