From 1e8ec634e26a07c66a7c9dace0ef7acfe88705ca Mon Sep 17 00:00:00 2001 From: yackob03 Date: Thu, 13 Feb 2014 11:44:39 -0500 Subject: [PATCH] Some small fixes to the dockerfile build worker. --- workers/dockerfilebuild.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/workers/dockerfilebuild.py b/workers/dockerfilebuild.py index 27531c30c..6d50601da 100644 --- a/workers/dockerfilebuild.py +++ b/workers/dockerfilebuild.py @@ -56,7 +56,7 @@ class DockerfileBuildContext(object): self._push_token = push_token self._cl = Client(timeout=1200, version='1.7') self._status = StatusWrapper(build_uuid) - self._build_logger = partial(build_logs, build_uuid) + self._build_logger = partial(build_logs.append_log_message, build_uuid) dockerfile_path = os.path.join(self._build_dir, "Dockerfile") self._num_steps = DockerfileBuildContext.__count_steps(dockerfile_path) @@ -101,17 +101,18 @@ class DockerfileBuildContext(object): current_step = 0 built_image = None for status in build_status: - logger.debug('Status: %s', str(status.encode('utf-8'))) + status_str = str(status.encode('utf-8')) + logger.debug('Status: %s', status_str) step_increment = re.search(r'Step ([0-9]+) :', status) if step_increment: - self._build_logger(str(status), build_logs.COMMAND) + self._build_logger(status_str, 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: - self._build_logger(str(status)) + self._build_logger(status_str) complete = re.match(r'Successfully built ([a-z0-9]+)$', status) if complete: @@ -314,7 +315,7 @@ class DockerfileBuildWorker(Worker): logger.exception('Exception when processing request.') repository_build.phase = 'error' repository_build.save() - log_appender(exc.message, build_logs.ERROR) + log_appender(str(exc), build_logs.ERROR) return False return True