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

data/buildlogs.py

@@ -3,6 +3,10 @@ import json
 
 
 class BuildLogs(object):
+  ERROR = 'error'
+  COMMAND = 'command'
+  PHASE = 'phase'
+
   def __init__(self, redis_host):
     self._redis = redis.StrictRedis(host=redis_host)
 
@@ -10,10 +14,6 @@ class BuildLogs(object):
   def _logs_key(build_id):
     return 'builds/%s/logs' % build_id
 
-  @staticmethod
-  def _commands_key(build_id):
-    return 'builds/%s/commands' % build_id
-
   def append_log_entry(self, build_id, log_obj):
     """
     Appends the serialized form of log_obj to the end of the log entry list
@@ -21,7 +21,7 @@ class BuildLogs(object):
     """
     return self._redis.rpush(self._logs_key(build_id), json.dumps(log_obj))
 
-  def append_log_message(self, build_id, log_message):
+  def append_log_message(self, build_id, log_message, log_type=None):
     """
     Wraps the message in an envelope and push it to the end of the log entry
     list and returns the index at which it was inserted.
@@ -29,54 +29,21 @@ class BuildLogs(object):
     log_obj = {
       'message': log_message
     }
+
+    if log_type:
+      log_obj['type'] = log_type
+
     return self._redis.rpush(self._logs_key(build_id), json.dumps(log_obj)) - 1
 
-  def append_command_message(self, build_id, command_message):
-    """
-    Wraps the message in an envelope and push it to the end of the log entry
-    list, to the commands list, and returns the new length of the list.
-    """
-    log_obj = {
-      'message': command_message,
-      'is_command': True,
-    }
-    idx = self._redis.rpush(self._logs_key(build_id), json.dumps(log_obj)) - 1
-
-    cmd_obj = {
-      'message': command_message,
-      'index': idx,
-    }
-    self._redis.rpush(self._commands_key(build_id), json.dumps(cmd_obj))
-    return idx
-
-  def get_log_entries(self, build_id, start_index, end_index):
+  def get_log_entries(self, build_id, start_index):
     """ 
     Returns a tuple of the current length of the list and an iterable of the
-    requested log entries. End index is inclusive.
+    requested log entries.
     """
     llen = self._redis.llen(self._logs_key(build_id))
-    log_entries = self._redis.lrange(self._logs_key(build_id), start_index,
-                                     end_index)
+    log_entries = self._redis.lrange(self._logs_key(build_id), start_index, -1)
     return (llen, (json.loads(entry) for entry in log_entries))
 
-  def get_commands(self, build_id):
-    """
-    Returns a list of all Dockerfile commands that have passed through the
-    specified build thus far.
-    """
-    commands = self._redis.lrange(self._commands_key(build_id), 0, -1)
-    return (json.loads(cmd) for cmd in commands)
-
-  def get_last_command(self, build_id):
-    """
-    Returns only the last command from the list of commands.
-    """
-    commands = self._redis.lrange(self._commands_key(build_id), -1, -1)
-    if commands:
-      return json.loads(commands[-1])
-    else:
-      return None
-
   @staticmethod
   def _status_key(build_id):
     return 'builds/%s/status' % build_id