Merge pull request #1 from areedtomlinson/bellhops

Reed Tomlinson · Reed Tomlinson · commit 0f84489154ba · 2015-06-03T08:38:52.000-05:00
Merge bellhops into main branch
diff --git a/dj_elastictranscoder/views.py b/dj_elastictranscoder/views.py
@@ -1,4 +1,5 @@
 import json
+import logging
 
 from django.http import HttpResponse, HttpResponseBadRequest
 from django.views.decorators.csrf import csrf_exempt
@@ -11,6 +12,8 @@
     transcode_oncomplete
 )
 
+logger = logging.getLogger('bellhops')
+
 @csrf_exempt
 def endpoint(request):
     """
@@ -22,6 +25,9 @@ def endpoint(request):
     except ValueError:
         return HttpResponseBadRequest('Invalid JSON')
 
+    logger.info("Transcoding endpoint hit with data {data}".format(
+        data=data
+    ))
 
     # handle SNS subscription
     if data['Type'] == 'SubscriptionConfirmation':
@@ -43,21 +49,30 @@ def endpoint(request):
 
     #
     if message['state'] == 'PROGRESSING':
-        job = EncodeJob.objects.get(pk=message['jobId'])
+        try:
+            job = EncodeJob.objects.get(pk=message['jobId'])
+        except EncodeJob.DoesNotExist:
+            return HttpResponse("Bad jobID", status=400)
         job.message = 'Progress'
         job.state = 1
         job.save()
 
         transcode_onprogress.send(sender=None, job=job, message=message)
     elif message['state'] == 'COMPLETED':
-        job = EncodeJob.objects.get(pk=message['jobId'])
+        try:
+            job = EncodeJob.objects.get(pk=message['jobId'])
+        except EncodeJob.DoesNotExist:
+            return HttpResponse("Bad jobID", status=400)
         job.message = 'Success'
         job.state = 4
         job.save()
 
         transcode_oncomplete.send(sender=None, job=job, message=message)
     elif message['state'] == 'ERROR':
-        job = EncodeJob.objects.get(pk=message['jobId'])
+        try:
+            job = EncodeJob.objects.get(pk=message['jobId'])
+        except EncodeJob.DoesNotExist:
+            return HttpResponse("Bad jobID", status=400)
         job.message = message['messageDetails']
         job.state = 2
         job.save()
