Really try to emulate the logs format with the test logs. Switch to a simplified flat logs format.

workers/dockerfilebuild.py

@@ -10,6 +10,7 @@ import shutil
 from docker import Client, APIError
 from tempfile import TemporaryFile, mkdtemp
 from zipfile import ZipFile
+from functools import partial
 
 from data.queue import dockerfile_build_queue
 from data import model
@@ -53,9 +54,9 @@ class DockerfileBuildContext(object):
     self._build_dir = build_context_dir
     self._tag_name = tag_name
     self._push_token = push_token
-    self._build_uuid = build_uuid
     self._cl = Client(timeout=1200, version='1.7')
-    self._status = StatusWrapper(self._build_uuid)
+    self._status = StatusWrapper(build_uuid)
+    self._build_logger = partial(build_logs, build_uuid)
 
     dockerfile_path = os.path.join(self._build_dir, "Dockerfile")
     self._num_steps = DockerfileBuildContext.__count_steps(dockerfile_path)
@@ -93,7 +94,7 @@ class DockerfileBuildContext(object):
     with self._status as status:
       status['total_commands'] = self._num_steps
 
-    logger.debug('Building to tag names: %s' % self._tag_name)
+    logger.debug('Building to tag named: %s' % self._tag_name)
     build_status = self._cl.build(path=self._build_dir, tag=self._tag_name,
                                   stream=True)
 
@@ -103,14 +104,14 @@ class DockerfileBuildContext(object):
       logger.debug('Status: %s', str(status.encode('utf-8')))
       step_increment = re.search(r'Step ([0-9]+) :', status)
       if step_increment:
-        build_logs.append_command_message(str(status))
+        self._build_logger(str(status), build_logs.COMMAND)
         current_step = int(step_increment.group(1))
         logger.debug('Step now: %s/%s' % (current_step, self._num_steps))
         with self._status as status:
           status['current_command'] = current_step
         continue
       else:
-        build_logs.append_log_message(self._build_uuid, str(status))
+        self._build_logger(str(status))
 
       complete = re.match(r'Successfully built ([a-z0-9]+)$', status)
       if complete:
@@ -260,10 +261,15 @@ class DockerfileBuildWorker(Worker):
     tag_name = repository_build.tag
     access_token = repository_build.access_token.code
 
-    start_msg = ('Starting job with resource url: %s tag: %s and token: %s' %
-                 (resource_url, tag_name, access_token))
+    log_appender = partial(build_logs.append_log_message,
+                           repository_build.uuid)
+
+    log_appender('initializing', build_logs.PHASE)
+
+    start_msg = ('Starting job with resource url: %s tag: %s' % (resource_url,
+                                                                 tag_name))
     logger.debug(start_msg)
-    build_logs.append_log_message(repository_build.uuid, start_msg)
+    log_appender(start_msg)
 
     docker_resource = requests.get(resource_url)
     c_type = docker_resource.headers['content-type']
@@ -271,13 +277,13 @@ class DockerfileBuildWorker(Worker):
     filetype_msg = ('Request to build file of type: %s with tag: %s' %
                     (c_type, tag_name))
     logger.info(filetype_msg)
-    build_logs.append_log_message(repository_build.uuid, filetype_msg)
+    log_appender(filetype_msg)
 
     if c_type not in self._mime_processors:
       raise RuntimeError('Invalid dockerfile content type: %s' % c_type)
 
     build_dir = self._mime_processors[c_type](docker_resource)
-    uuid = repository_build.uuid
+    log_appender('building', build_logs.PHASE)
     repository_build.phase = 'building'
     repository_build.save()
 
@@ -287,24 +293,28 @@ class DockerfileBuildWorker(Worker):
         built_image = build_ctxt.build()
 
         if not built_image:
+          log_appender('error', build_logs.PHASE)
           repository_build.phase = 'error'
           repository_build.save()
-          build_logs.append_log_message(uuid, 'Unable to build dockerfile.')
+          log_appender('Unable to build dockerfile.', build_logs.ERROR)
           return False
 
+        log_appender('pushing', build_logs.PHASE)
         repository_build.phase = 'pushing'
         repository_build.save()
 
         build_ctxt.push(built_image)
 
+        log_appender('complete', build_logs.PHASE)
         repository_build.phase = 'complete'
         repository_build.save()
 
       except Exception as exc:
+        log_appender('error', build_logs.PHASE)
         logger.exception('Exception when processing request.')
         repository_build.phase = 'error'
         repository_build.save()
-        build_logs.append_log_message(uuid, exc.message)
+        log_appender(exc.message, build_logs.ERROR)
         return False
 
     return True