scraper_q: Gracefully degrade to thumbnail-only when no embedly.

Between the local filesystem media provider and this change, scraper_q is workable after a default install now.
reddit-archive · Oct 14, 2013 · 8bdc623 · 8bdc623
1 parent b9f146d
commit 8bdc623
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/install-reddit.sh b/install-reddit.sh
@@ -483,7 +483,7 @@ function set_consumer_count {
 
 set_consumer_count log_q 0
 set_consumer_count cloudsearch_q 0
-set_consumer_count scraper_q 0
+set_consumer_count scraper_q 1
 set_consumer_count commentstree_q 1
 set_consumer_count newcomments_q 1
 set_consumer_count vote_link_q 1

diff --git a/r2/r2/lib/media.py b/r2/r2/lib/media.py
@@ -504,6 +504,10 @@ def _fetch_embedly_service_data():
 
 
 def _fetch_embedly_services():
+    if not g.embedly_api_key:
+        g.log.warning("No embedly_api_key configured. Will not use embed.ly.")
+        return []
+
     service_data = _fetch_embedly_service_data()
 
     services = []