From: jelmer@samba.org <jelmer@samba.org>
Date: Sat, 4 Dec 2010 03:50:46 +0000 (+0100)
Subject: Add +stderr and +stdout.
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=7fe73cd21caaa830333b52acbe7f5b7983dfa14f;p=build-farm.git

Add +stderr and +stdout.
---

diff --git a/buildfarm/web/__init__.py b/buildfarm/web/__init__.py
index a4937472..aa60fc46 100755
--- a/buildfarm/web/__init__.py
+++ b/buildfarm/web/__init__.py
@@ -467,6 +467,9 @@ class ViewBuildPage(BuildFarmPage):
         yield "<div id='log'>"
 
         yield "<p><a href='%s/+subunit'>Subunit output</a></p>" % build_uri(myself, build)
+        yield "<p><a href='%s/+stdout'>Standard output (as plain text)</a>, " % build_uri(myself, build)
+        yield "<a href='%s/+stderr'>Standard error (as plain text)</a>" % build_uri(myself, build)
+        yield "</p>"
 
         if not plain_logs:
             yield "<p>Switch to the <a href='%s?function=View+Build;host=%s;tree=%s"\
@@ -998,6 +1001,16 @@ class BuildFarmApp(object):
                         yield build.read_subunit().read()
                     except NoTestOutput:
                         yield "There was no test output"
+                elif subfn == "+stdout":
+                    start_response('200 OK', [
+                        ('Content-type', 'text/plain; charset=utf-8'),
+                        ('Content-Disposition', 'attachment; filename="%s.%s.%s-%s.log"' % (build.tree, build.host, build.compiler, build.revision))])
+                    yield build.read_log().read()
+                elif subfn == "+stderr":
+                    start_response('200 OK', [
+                        ('Content-type', 'text/plain; charset=utf-8'),
+                        ('Content-Disposition', 'attachment; filename="%s.%s.%s-%s.err"' % (build.tree, build.host, build.compiler, build.revision))])
+                    yield build.read_err().read()
                 elif subfn in ("", None):
                     start_response('200 OK', [
                         ('Content-type', 'text/html; charset=utf-8')])