Merge pull request #321 from RickyCook/db-instability

Db instability

Author: RickyCook

dockci/handlers.py

@@ -6,7 +6,14 @@
 import jwt
 import rollbar
 
-from flask import abort, flash, redirect, request, request_finished, Response
+from flask import (abort,
+                   flash,
+                   got_request_exception,
+                   redirect,
+                   request,
+                   request_finished,
+                   Response,
+                   )
 from flask_login import login_url
 from flask_security.utils import verify_and_update_password
 
@@ -161,6 +168,7 @@ def try_basic_auth():
     )
 
 
+@got_request_exception.connect
 @request_finished.connect
 def db_rollback(*args, **kwargs):  # pylint:disable=unused-argument
     """ Rollback the DB transaction when the request completes """

dockci/views/job.py

@@ -57,6 +57,11 @@ def job_new_view(project_slug):
 
     if request.headers['X-Github-Event'] == 'push':
         push_data = request.json
+
+        # Ref deletion
+        if push_data['head_commit'] is None:
+            abort(200)
+
         job.commit = push_data['head_commit']['id']
 
         ref_type, ref_name = parse_ref(push_data['ref'])