Phase 4 of the namespace to user migration: actually remove the column from the db and remove the dependence on serialized namespaces in the workers and queues

workers/diffsworker.py

@@ -1,30 +1,28 @@
 import logging
-import argparse
 
 from app import image_diff_queue
-from data.model import DataModelException
+from data import model
 from endpoints.registry import process_image_changes
 from workers.worker import Worker
 
 
-root_logger = logging.getLogger('')
-root_logger.setLevel(logging.DEBUG)
-
-FORMAT = '%(asctime)-15s - %(levelname)s - %(pathname)s - %(funcName)s - %(message)s'
-formatter = logging.Formatter(FORMAT)
-
 logger = logging.getLogger(__name__)
 
 
 class DiffsWorker(Worker):
   def process_queue_item(self, job_details):
     image_id = job_details['image_id']
-    namespace = job_details['namespace']
     repository = job_details['repository']
 
+    # TODO switch to the namespace_user_id branch only once exisiting jobs have all gone through
+    if 'namespace_user_id' in job_details:
+      namespace = model.get_namespace_by_user_id(job_details['namespace_user_id'])
+    else:
+      namespace = job_details['namespace']
+
     try:
       process_image_changes(namespace, repository, image_id)
-    except DataModelException:
+    except model.DataModelException:
       # This exception is unrecoverable, and the item should continue and be
       # marked as complete.
       msg = ('Image does not exist in database \'%s\' for repo \'%s/\'%s\'' %