Merge pull request #16 from edx/deployment_debug

Updated variables debug

default_encode_profiles.json

@@ -20,13 +20,7 @@
             "rate_factor":27,
             "filetype":"mp4"
         },
-        "mobile_high":{  
-            "encode_suffix":"MB1",
-            "resolution":540,
-            "rate_factor":27,
-            "filetype":"mp4"
-        },
-        "desktop_mp4":{  
+        "desktop_mp4":{
             "encode_suffix":"DTH",
             "resolution":720,
             "rate_factor":27,

instance_config.yaml

@@ -117,10 +117,8 @@ encode_dict:
     mobile_override:
         - override
     s3_proc:
-        - mobile_high
         - mobile_low
         - audio_mp3
-        - desktop_webm
         - desktop_mp4
         - hls
 
@@ -142,15 +140,9 @@ val_profile_dict:
         - mobile_low
         - mobile_high
 
-    mobile_high:
-        - mobile_high
-
     audio_mp3:
         - audio_mp3
 
-    desktop_webm:
-        - desktop_webm
-
     youtube:
         - youtube
     review:

video_worker/__init__.py

@@ -160,7 +160,7 @@ class VideoWorker(object):
             encode_profile = self.encode_profile
             deliverable_route.apply_async(
                 (veda_id, encode_profile),
-                queue='transcode_stat'
+                queue=self.settings['celery_deliver_queue']
             )
         # Clean up workdir
         if self.jobid is not None:

video_worker/abstractions.py

@@ -154,13 +154,20 @@ class Encode(object):
         self.encode_library = None
 
     def pull_data(self):
-        if self.VideoObject.veda_id is not None:
-            veda_token = generate_apitoken.veda_tokengen()
-            if veda_token is None:
-                ErrorObject().print_error(
+        """
+        Retrieve Active and latest encode data from central VEDA node
+        """
+        # TODO: Change retrieval to a scheduled/delay process
+        if self.VideoObject.veda_id is None:
+            self._default_encodes()
+            return
+
+        veda_token = generate_apitoken.veda_tokengen()
+        if veda_token is None:
+            ErrorObject().print_error(
                     message="VEDA Token Generate"
                 )
-                return None
+            return None
 
             data = {'product_spec': self.profile_name}
 
@@ -190,20 +197,19 @@ class Encode(object):
                     self.encode_pk = e['id']
 
             if self.encode_suffix is None:
-                ErrorObject().print_error(
-                    message="VEDA API Encode Data Fail: No Suffix"
-                )
-                return None
-        else:
-            '''
-            filetype': u'mp4', u'encode_suffix': u'DTH', u'resolution': 720, u'rate_factor'
-            '''
-            encode_data = self._read_encodes()
-            self.resolution = encode_data[self.profile_name]['resolution']
-            self.rate_factor = encode_data[self.profile_name]['rate_factor']
-            self.filetype = encode_data[self.profile_name]['filetype']
-            self.encode_suffix = encode_data[self.profile_name]['encode_suffix']
-            self.encode_pk = None
+                # In the case of an API Error
+                self._default_encodes()
+
+    def _default_encodes(self):
+        """
+        filetype': u'mp4', u'encode_suffix': u'DTH', u'resolution': 720, u'rate_factor'
+        """
+        encode_data = self._read_encodes()
+        self.resolution = encode_data[self.profile_name]['resolution']
+        self.rate_factor = encode_data[self.profile_name]['rate_factor']
+        self.filetype = encode_data[self.profile_name]['filetype']
+        self.encode_suffix = encode_data[self.profile_name]['encode_suffix']
+        self.encode_pk = None
 
     def _read_encodes(self):
         if self.encode_library is None:

video_worker/video_images.py

@@ -172,7 +172,7 @@ class VideoImages(object):
                     self.settings['val_video_images_url'],
                     data=json.dumps(data),
                     headers=val_headers,
-                    timeout=settings['global_timeout']
+                    timeout=self.settings['global_timeout']
                 )
 
                 if not response.ok: