Merge pull request #240 from kdambekalns/fix-error-handling

BUGFIX: Fix error handling

Author: kdambekalns

Classes/Command/NodeIndexCommandController.php

@@ -303,7 +303,11 @@ public function cleanupCommand()
             }
         } catch (ApiException $exception) {
             $response = json_decode($exception->getResponse());
-            $this->logger->log(sprintf('Nothing removed. ElasticSearch responded with status %s, saying "%s: %s"', $response->status, $response->error->type, $response->error->reason));
+            if ($response->error instanceof \stdClass) {
+                $this->logger->log(sprintf('Nothing removed. ElasticSearch responded with status %s, saying "%s: %s"', $response->status, $response->error->type, $response->error->reason));
+            } else {
+                $this->logger->log(sprintf('Nothing removed. ElasticSearch responded with status %s, saying "%s"', $response->status, $response->error));
+            }
         }
     }
 

Classes/Driver/AbstractIndexerDriver.php

@@ -47,7 +47,9 @@ protected function findClosestFulltextRoot(NodeInterface $node)
             $closestFulltextNode = $closestFulltextNode->getParent();
             if ($closestFulltextNode === null) {
                 // root of hierarchy, no fulltext root found anymore, abort silently...
-                $this->logger->log(sprintf('NodeIndexer: No fulltext root found for node %s (%s)', $node->getContextPath(), $node->getIdentifier()), LOG_WARNING, null, 'ElasticSearch (CR)');
+                if ($node->getPath() !== '/' && $node->getPath() !== '/sites') {
+                    $this->logger->log(sprintf('NodeIndexer: No fulltext root found for node %s (%s)', $node->getContextPath(), $node->getIdentifier()), LOG_WARNING, null, 'ElasticSearch (CR)');
+                }
 
                 return null;
             }