Merge pull request #897 from jakedt/stagingfixes

Staging fixes

conf/gunicorn_verbs.py

@@ -1,6 +1,13 @@
+from Crypto import Random
+
 bind = 'unix:/tmp/gunicorn_verbs.sock'
 workers = 4
 logconfig = 'conf/logging.conf'
 pythonpath = '.'
 preload_app = True
 timeout = 2000  # Because sync workers
+
+def post_fork(server, worker):
+  # Reset the Random library to ensure it won't raise the "PID check failed." error after
+  # gunicorn forks.
+  Random.atfork()

conf/gunicorn_web.py

@@ -1,6 +1,13 @@
+from Crypto import Random
+
 bind = 'unix:/tmp/gunicorn_web.sock'
 workers = 2
 worker_class = 'gevent'
 logconfig = 'conf/logging.conf'
 pythonpath = '.'
 preload_app = True
+
+def post_fork(server, worker):
+  # Reset the Random library to ensure it won't raise the "PID check failed." error after
+  # gunicorn forks.
+  Random.atfork()

data/model/image.py

@@ -418,7 +418,7 @@ def get_image_layers(image):
            .join(Image)
            .where(Image.id << image_ids))
 
-  image_list = list(_translate_placements_to_images_with_locations(query))
+  image_list = list(invert_placement_query_results(query))
   image_list.sort(key=lambda image: image_ids.index(str(image.id)))
   return image_list