When a checker fails with an exception, reset the status and set the appropriate error message on the meta data.

Author: hostep

Updater/Catalog/Category/UrlKey.php

@@ -44,10 +44,17 @@ public function refresh(string $initiator): array
         $this->metaStorage->setErrorMessage($storageIdentifier, '');
         $this->metaStorage->setStartRefreshing($storageIdentifier, $initiator);
 
-        $categoryData = $this->urlKeyChecker->execute();
-        $this->storage->write($storageIdentifier, $categoryData);
+        try {
+            $categoryData = $this->urlKeyChecker->execute();
+            $this->storage->write($storageIdentifier, $categoryData);
 
-        $this->metaStorage->setFinishedRefreshing($storageIdentifier);
+            $this->metaStorage->setFinishedRefreshing($storageIdentifier);
+        } catch (\Throwable $ex) {
+            $this->metaStorage->clearStatus($storageIdentifier);
+            $this->metaStorage->setErrorMessage($storageIdentifier, $ex->getMessage());
+
+            throw $ex;
+        }
 
         return $categoryData;
     }

Updater/Catalog/Category/UrlPath.php

@@ -44,10 +44,17 @@ public function refresh(string $initiator): array
         $this->metaStorage->setErrorMessage($storageIdentifier, '');
         $this->metaStorage->setStartRefreshing($storageIdentifier, $initiator);
 
-        $categoryData = $this->urlPathChecker->execute();
-        $this->storage->write($storageIdentifier, $categoryData);
+        try {
+            $categoryData = $this->urlPathChecker->execute();
+            $this->storage->write($storageIdentifier, $categoryData);
 
-        $this->metaStorage->setFinishedRefreshing($storageIdentifier);
+            $this->metaStorage->setFinishedRefreshing($storageIdentifier);
+        } catch (\Throwable $ex) {
+            $this->metaStorage->clearStatus($storageIdentifier);
+            $this->metaStorage->setErrorMessage($storageIdentifier, $ex->getMessage());
+
+            throw $ex;
+        }
 
         return $categoryData;
     }

Updater/Catalog/Product/UrlKey.php

@@ -44,10 +44,17 @@ public function refresh(string $initiator): array
         $this->metaStorage->setErrorMessage($storageIdentifier, '');
         $this->metaStorage->setStartRefreshing($storageIdentifier, $initiator);
 
-        $productData = $this->urlKeyChecker->execute();
-        $this->storage->write($storageIdentifier, $productData);
+        try {
+            $productData = $this->urlKeyChecker->execute();
+            $this->storage->write($storageIdentifier, $productData);
 
-        $this->metaStorage->setFinishedRefreshing($storageIdentifier);
+            $this->metaStorage->setFinishedRefreshing($storageIdentifier);
+        } catch (\Throwable $ex) {
+            $this->metaStorage->clearStatus($storageIdentifier);
+            $this->metaStorage->setErrorMessage($storageIdentifier, $ex->getMessage());
+
+            throw $ex;
+        }
 
         return $productData;
     }

Updater/Catalog/Product/UrlPath.php

@@ -44,10 +44,17 @@ public function refresh(string $initiator): array
         $this->metaStorage->setErrorMessage($storageIdentifier, '');
         $this->metaStorage->setStartRefreshing($storageIdentifier, $initiator);
 
-        $productData = $this->urlPathChecker->execute();
-        $this->storage->write($storageIdentifier, $productData);
+        try {
+            $productData = $this->urlPathChecker->execute();
+            $this->storage->write($storageIdentifier, $productData);
 
-        $this->metaStorage->setFinishedRefreshing($storageIdentifier);
+            $this->metaStorage->setFinishedRefreshing($storageIdentifier);
+        } catch (\Throwable $ex) {
+            $this->metaStorage->clearStatus($storageIdentifier);
+            $this->metaStorage->setErrorMessage($storageIdentifier, $ex->getMessage());
+
+            throw $ex;
+        }
 
         return $productData;
     }