Filter out assets / slow down cdn purge

ethercreative · Oct 6, 2023 · d38bfb5 · d38bfb5
1 parent efb22b6
commit d38bfb5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/jobs/RevalidateAssetJob.php b/src/jobs/RevalidateAssetJob.php
@@ -22,8 +22,6 @@ public function execute($queue): void
 
 		if (empty($doKey)) return;
 
-		sleep(5);
-
 		$client = Craft::createGuzzleClient();
 		$assets = Asset::find()->id($this->assetIds)->all();
 
@@ -36,6 +34,7 @@ public function execute($queue): void
 			->get('https://api.digitalocean.com/v2/cdn/endpoints?per_page=200', ['headers' => $headers])
 			->getBody()
 			->getContents();
+		sleep(1);
 
 		$allSpaces = json_decode($response)->endpoints;
 		$spaceFiles = [];
@@ -71,6 +70,7 @@ public function execute($queue): void
 			]);
 
 			$queue->setProgress(++$i / $total * 100);
+			sleep(1);
 		}
 	}
 

diff --git a/src/services/Revalidator.php b/src/services/Revalidator.php
@@ -235,11 +235,11 @@ private function pushRelatedElements(Element $element, array $exclude = null): a
 			])
 			->andWhere(['not in', 'sourceId', $exclude ?? []])
 			->andWhere(['not in', 'targetId', $exclude ?? []])
+			->andWhere(['not in', 'elements.type', ['craft\\elements\\Asset']])
 			->andWhere([
 				'revisionId' => null,
 				'draftId' => null,
 			])
-			->andWhere(['!=', 'elements.type', 'Asset'])
 			->groupBy('elements.type')
 			->pairs();