Merge pull request #101 from edx/yro/EDUCATOR-2786

Change HEAL for legacy video encodes.
edx · May 3, 2018 · 3d7d099 · 3d7d099
2 parents 2f0d8d4 + bdc457a
commit 3d7d099
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 6 deletions.
diff --git a/control/veda_heal.py b/control/veda_heal.py
@@ -55,10 +55,20 @@ def discovery(self):
                 hours=HEAL_END
             )
         )
-
+        for v in self.video_query:
+            LOGGER.info('[HEAL] {studio_id} | {video_id}: Determining Missing Encodes'.format(
+                studio_id=v.studio_id,
+                video_id=v.edx_id,
+            ))
         self.send_encodes()
 
     def send_encodes(self):
+        """
+        Unified function to enqueue videos with missing encodes
+
+        Ingest/HEAL both call this function
+        """
+        # TODO: Refactor to common location
         for v in self.video_query:
             encode_list = self.determine_fault(video_object=v)
             # Using the 'Video Proto' Model

diff --git a/control/veda_val.py b/control/veda_val.py
@@ -237,10 +237,11 @@ def profile_determiner(self, val_api_return):
 
         """
         # Defend against old/deprecated encodes
-        try:
-            self.auth_dict['val_profile_dict'][self.encode_profile]
-        except KeyError:
-            return
+        if self.encode_profile:
+            try:
+                self.auth_dict['val_profile_dict'][self.encode_profile]
+            except KeyError:
+                return
         if self.endpoint_url:
             for p in self.auth_dict['val_profile_dict'][self.encode_profile]:
 
@@ -270,7 +271,7 @@ def profile_determiner(self, val_api_return):
                     try:
                         self.auth_dict['val_profile_dict'][final.encode_profile.product_spec]
                     except KeyError:
-                        return
+                        continue
                     for p in self.auth_dict['val_profile_dict'][final.encode_profile.product_spec]:
                         test_list.append(dict(
                             url=str(final.encode_url),