Merge pull request #2 from manticoresoftware/dev

Dev
manticoresoftware · Sep 6, 2022 · 96c8bdc · 96c8bdc
2 parents 64f02d0 + 1e86d70
commit 96c8bdc
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/src/Manticore/ManticoreConnector.php b/src/Manticore/ManticoreConnector.php
@@ -211,12 +211,20 @@ public function addTableToCluster($tableName, $log = true): bool
 
     protected function query($sql, $logQuery = true, $attempts = 0)
     {
-        $result = $this->connection->query($sql);
+        try {
+            if ($logQuery) {
+                Analog::log('Query: '.$sql);
+            }
+            $result = $this->connection->query($sql);
 
-        if ($logQuery) {
-            Analog::log('Query: '.$sql);
+        } catch (\Exception $exception) {
+            Analog::log("Exception until query processing. Query: ".$sql."\n. Error: ".$exception);
+            if ($attempts > $this->maxAttempts) {
+                throw new \RuntimeException("Can't process query ".$sql);
+            }
         }
 
+
         if ($this->getConnectionError()) {
             Analog::log("Error until query processing. Query: ".$sql."\n. Error: ".$this->getConnectionError());
             if ($attempts > $this->maxAttempts) {
@@ -229,6 +237,7 @@ protected function query($sql, $logQuery = true, $attempts = 0)
             return $this->query($sql, $logQuery, $attempts);
         }
 
+
         return $result;
     }
 

diff --git a/src/Manticore/ManticoreStreamsJson.php b/src/Manticore/ManticoreStreamsJson.php
@@ -15,6 +15,13 @@ public function __construct($clusterName, NotificationInterface $notification, $
         parent::__construct($clusterName, $binaryPort);
 
         $this->notification = $notification;
+        $testsIndexMetadata = '/var/lib/manticore/tests/tests.meta';
+        if (file_exists($testsIndexMetadata)){
+            Analog::log('Tests metadata ' . file_get_contents($testsIndexMetadata));
+        }else{
+            Analog::log('Tests metadata not found');
+        }
+
         $this->restoreExistingIndexes();
     }