Prevent attempts to index entities with no data (such as deleted enti…

…ties)
bookbrainz · Feb 9, 2016 · ab1cf81 · ab1cf81
1 parent 2d2b12e
commit ab1cf81
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/bbws/custom.py b/bbws/custom.py
@@ -120,11 +120,13 @@ def reindex_search():
 
         es_conn = Elasticsearch()
         for entity in entities:
-            entity_out = marshal(entity, structures.ENTITY_EXPANDED)
-            data_out = marshal(entity.master_revision.entity_data,
-                               TYPE_MAP[type(entity)])
-
-            entity_out.update(data_out)
-            index_entity(es_conn, entity_out)
+            if (entity.master_revision is not None and
+                    entity.master_revision.entity_data is not None):
+                entity_out = marshal(entity, structures.ENTITY_EXPANDED)
+                data_out = marshal(entity.master_revision.entity_data,
+                                   TYPE_MAP[type(entity)])
+
+                entity_out.update(data_out)
+                index_entity(es_conn, entity_out)
 
         return jsonify({'success': True})