Update Samba build farm to new web site layout.
[build-farm.git] / buildfarm / web / __init__.py
index eae7ab04bed736b2d55c2d7f2c245d3192fa1d56..8794978b110d7a4844992be7bf3d8f2d1b6bee35 100755 (executable)
@@ -1,8 +1,8 @@
 #!/usr/bin/python
 # This CGI script presents the results of the build_farm build
 
-# Copyright (C) Jelmer Vernooij <jelmer@samba.org>     2010
-# Copyright (C) Matthieu Patou <mat@matws.net>         2010
+# Copyright (C) Jelmer Vernooij <jelmer@samba.org>     2010-2014
+# Copyright (C) Matthieu Patou <mat@matws.net>         2010-2012
 #
 # Based on the original web/build.pl:
 #
@@ -33,6 +33,7 @@
 
 from collections import defaultdict
 import os
+import sys
 
 from buildfarm import (
     hostdb,
@@ -54,7 +55,7 @@ import time
 import wsgiref.util
 webdir = os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "..", "web"))
 
-GITWEB_BASE = "http://gitweb.samba.org"
+GITWEB_BASE = "//gitweb.samba.org"
 HISTORY_HORIZON = 1000
 
 # this is automatically filled in
@@ -125,7 +126,8 @@ def build_uri(myself, build):
 
 
 def build_link(myself, build):
-    return "<a href='%s'>%s</a>" % (build_uri(myself, build), html_build_status(build.status()))
+    return "<a href='%s'>%s</a>" % (
+        build_uri(myself, build), html_build_status(build.status()))
 
 
 def tree_uri(myself, tree):
@@ -134,7 +136,8 @@ def tree_uri(myself, tree):
 
 def tree_link(myself, tree):
     """return a link to a particular tree"""
-    return "<a href='%s' title='View recent builds for %s'>%s:%s</a>" % (tree_uri(myself, tree), tree.name, tree.name, tree.branch)
+    return "<a href='%s' title='View recent builds for %s'>%s:%s</a>" % (
+        tree_uri(myself, tree), tree.name, tree.name, tree.branch)
 
 
 def host_uri(myself, host):
@@ -203,6 +206,10 @@ class LogPrettyPrinter(object):
         self.indice += 1
         return "".join(make_collapsible_html('test', m.group(1), '', self.indice, 'skipped'))
 
+    def _format_pretestsuite(self, m):
+        self.indice += 1
+        return m.group(1)+"".join(make_collapsible_html('pretest', 'Pretest infos', m.group(2), self.indice, 'ok'))+"\n"+m.group(3)
+
     def _format_testsuite(self, m):
         testName = m.group(1)
         content = m.group(2)
@@ -212,7 +219,11 @@ class LogPrettyPrinter(object):
         else:
             errorReason = ""
         self.indice += 1
-        return "".join(make_collapsible_html('test', testName, content+errorReason, self.indice, status))
+        backlink = ""
+        if m.group(3) in ("error", "failure"):
+            self.test_links.append([testName, 'lnk-test-%d' %self.indice])
+            backlink = "<p><a href='#shortcut2errors'>back to error list</a>"
+        return "".join(make_collapsible_html('test', testName, content+errorReason+backlink, self.indice, status))
 
     def _format_test(self, m):
         self.indice += 1
@@ -222,6 +233,7 @@ class LogPrettyPrinter(object):
         # do some pretty printing for the actions
         pattern = re.compile("(Running action\s+([\w\-]+)$(?:\s^.*$)*?\sACTION\ (PASSED|FAILED):\ ([\w\-]+)$)", re.M)
         log = pattern.sub(self._pretty_print, log)
+        buf = ""
 
         log = re.sub("""
               --==--==--==--==--==--==--==--==--==--==--.*?
@@ -233,9 +245,13 @@ class LogPrettyPrinter(object):
               ==========================================\s+
             """, self._format_stage, log)
 
+        pattern = re.compile("(Running action test).*$\s((?:^.*$\s)*?)^((?:skip-)?testsuite: )", re.M)
+        log = pattern.sub(self._format_pretestsuite, log)
+
         log = re.sub("skip-testsuite: ([\w\-=,_:\ /.&; \(\)]+).*?",
                 self._format_skip_testsuite, log)
 
+        self.test_links = []
         pattern = re.compile("^testsuite: (.+)$\s((?:^.*$\s)*?)testsuite-(\w+): .*?(?:(\[$\s(?:^.*$\s)*?^\]$)|$)", re.M)
         log = pattern.sub(self._format_testsuite, log)
         log = re.sub("""
@@ -244,6 +260,12 @@ class LogPrettyPrinter(object):
               (success|xfail|failure|skip|uxsuccess): [\w\-=,_:\ /.&; \(\)]+( \[.*?\])?.*?
            """, self._format_test, log)
 
+        for tst in self.test_links:
+            buf = "%s\n<A href='#%s'>%s</A>" % (buf, tst[1], tst[0])
+
+        if not buf == "":
+            divhtml = "".join(make_collapsible_html('testlinks', 'Shortcut to failed tests', "<a name='shortcut2errors'></a>%s" % buf, self.indice, ""))+"\n"
+            log = re.sub("Running action\s+test", divhtml, log)
         return "<pre>%s</pre>" % log
 
 
@@ -325,7 +347,7 @@ def make_collapsible_html(type, title, output, id, status=""):
     # note that we may be inside a <pre>, so we don't put any extra whitespace
     # in this html
     yield "<div class='%s unit %s' id='%s-%s'>" % (type, status, type, id)
-    yield "<a href=\"javascript:handle('%s');\">" % id
+    yield "<a name='lnk-%s-%s' href=\"javascript:handle('%s');\">" % (type, id, id)
     yield "<img id='img-%s' name='img-%s' alt='%s' src='%s' />" % (id, id, status, icon)
     yield "<div class='%s title'>%s</div></a>" % (type, title)
     yield "<div class='%s status %s'>%s</div>" % (type, status, status)
@@ -385,8 +407,10 @@ class BuildFarmPage(object):
 
 class ViewBuildPage(BuildFarmPage):
 
-    def show_oldrevs(self, myself, tree, host, compiler):
+    def show_oldrevs(self, myself, build, host, compiler, limit=None):
         """show the available old revisions, if any"""
+
+        tree = build.tree
         old_builds = self.buildfarm.builds.get_old_builds(tree, host, compiler)
 
         if not old_builds:
@@ -394,11 +418,11 @@ class ViewBuildPage(BuildFarmPage):
 
         yield "<h2>Older builds:</h2>\n"
 
-        yield "<table class='real'>\n"
+        yield "<table class='newtable'>\n"
         yield "<thead><tr><th>Revision</th><th>Status</th><th>Age</th></tr></thead>\n"
         yield "<tbody>\n"
 
-        for old_build in old_builds:
+        for old_build in old_builds[:limit]:
             yield "<tr><td>%s</td><td>%s</td><td>%s</td></tr>\n" % (
                 revision_link(myself, old_build.revision, tree),
                 build_link(myself, old_build),
@@ -406,7 +430,9 @@ class ViewBuildPage(BuildFarmPage):
 
         yield "</tbody></table>\n"
 
-    def render(self, myself, build, plain_logs=False):
+        yield "<p><a href='%s/limit/-1'>Show all previous build list</a>\n" % (build_uri(myself, build))
+
+    def render(self, myself, build, plain_logs=False, limit=10):
         """view one build in detail"""
 
         uname = None
@@ -447,7 +473,7 @@ class ViewBuildPage(BuildFarmPage):
         if os.path.exists(host_web_file):
             yield util.FileLoad(host_web_file)
 
-        yield "<table class='real'>\n"
+        yield "<table class='newtable'>\n"
         yield "<tr><td>Host:</td><td><a href='%s?function=View+Host;host=%s;tree=%s;"\
               "compiler=%s#'>%s</a> - %s</td></tr>\n" %\
                 (myself, build.host, build.tree, build.compiler, build.host, self.buildfarm.hostdb[build.host].platform.encode("utf-8"))
@@ -464,7 +490,7 @@ class ViewBuildPage(BuildFarmPage):
             yield "<tr><td>configure options:</td><td>%s</td></tr>\n" % config
         yield "</table>\n"
 
-        yield "".join(self.show_oldrevs(myself, build.tree, build.host, build.compiler))
+        yield "".join(self.show_oldrevs(myself, build, build.host, build.compiler, limit))
 
         # check the head of the output for our magic string
         rev_var = ""
@@ -506,7 +532,7 @@ class ViewBuildPage(BuildFarmPage):
                 yield "<h2>Build log:</h2>\n"
                 yield print_log_pretty(log)
 
-            yield "<p><small>Some of the above icons derived from the <a href='http://www.gnome.org'>Gnome Project</a>'s stock icons.</small></p>"
+            yield "<p><small>Some of the above icons derived from the <a href='//www.gnome.org'>Gnome Project</a>'s stock icons.</small></p>"
             yield "</div>"
         else:
             yield "<p>Switch to the <a href='%s?function=View+Build;host=%s;tree=%s;"\
@@ -533,6 +559,10 @@ class ViewRecentBuildsPage(BuildFarmPage):
         all_builds = []
 
         def build_platform(build):
+            host = self.buildfarm.hostdb[build.host]
+            return host.platform.encode("utf-8")
+
+        def build_platform_safe(build):
             try:
                 host = self.buildfarm.hostdb[build.host]
             except hostdb.NoSuchHost:
@@ -544,7 +574,7 @@ class ViewRecentBuildsPage(BuildFarmPage):
             "revision": lambda a, b: cmp(a.revision, b.revision),
             "age": lambda a, b: cmp(a.age, b.age),
             "host": lambda a, b: cmp(a.host, b.host),
-            "platform": lambda a, b: cmp(build_platform(a), build_platform(b)),
+            "platform": lambda a, b: cmp(build_platform_safe(a), build_platform_safe(b)),
             "compiler": lambda a, b: cmp(a.compiler, b.compiler),
             "status": lambda a, b: cmp(a.status(), b.status()),
             }
@@ -566,7 +596,7 @@ class ViewRecentBuildsPage(BuildFarmPage):
 
         yield "<div id='recent-builds' class='build-section'>"
         yield "<h2>Recent builds of %s (%s branch %s)</h2>" % (tree, t.scm, t.branch)
-        yield "<table class='real'>"
+        yield "<table class='newtable'>"
         yield "<thead>"
         yield "<tr>"
         yield "<th><a href='%s;sortby=age' title='Sort by build age'>Age</a></th>" % sorturl
@@ -579,15 +609,19 @@ class ViewRecentBuildsPage(BuildFarmPage):
         yield "<tbody>"
 
         for build in all_builds:
-            yield "<tr>"
-            yield "<td>%s</td>" % util.dhm_time(build.age)
-            yield "<td>%s</td>" % revision_link(myself, build.revision, build.tree)
-            yield "<td>%s</td>" % build.tree
-            yield "<td>%s</td>" % build_platform(build)
-            yield "<td>%s</td>" % host_link(myself, build.host)
-            yield "<td>%s</td>" % build.compiler
-            yield "<td>%s</td>" % build_link(myself, build)
-            yield "</tr>"
+            try:
+                build_platform_name = build_platform(build)
+                yield "<tr>"
+                yield "<td>%s</td>" % util.dhm_time(build.age)
+                yield "<td>%s</td>" % revision_link(myself, build.revision, build.tree)
+                yield "<td>%s</td>" % build.tree
+                yield "<td>%s</td>" % build_platform_name
+                yield "<td>%s</td>" % host_link(myself, build.host)
+                yield "<td>%s</td>" % build.compiler
+                yield "<td>%s</td>" % build_link(myself, build)
+                yield "</tr>"
+            except hostdb.NoSuchHost:
+                pass
         yield "</tbody></table>"
         yield "</div>"
 
@@ -595,10 +629,10 @@ class ViewRecentBuildsPage(BuildFarmPage):
 class ViewHostPage(BuildFarmPage):
 
     def _render_build_list_header(self, host):
-        yield "<div class='host summary'>"
+        yield "<div>"
         yield "<a id='host' name='host'/>"
-        yield "<h3>%s - %s</h3>" % (host.name, host.platform.encode("utf-8"))
-        yield "<table class='real'>"
+        yield "<h2>%s - %s</h2>" % (host.name, host.platform.encode("utf-8"))
+        yield "<table class='newtable'>"
         yield "<thead><tr><th>Target</th><th>Build<br/>Revision</th><th>Build<br />Age</th><th>Status<br />config/build<br />install/test</th><th>Warnings</th></tr></thead>"
         yield "<tbody>"
 
@@ -619,7 +653,6 @@ class ViewHostPage(BuildFarmPage):
             try:
                 host = self.buildfarm.hostdb[hostname]
             except hostdb.NoSuchHost:
-                deadhosts.append(hostname)
                 continue
             builds = list(self.buildfarm.get_host_builds(hostname))
             if len(builds) > 0:
@@ -665,7 +698,7 @@ class ViewHostPage(BuildFarmPage):
 
         yield "<div class='build-section' id='dead-hosts'>"
         yield "<h2>Dead Hosts:</h2>"
-        yield "<table class='real'>"
+        yield "<table class='newtable'>"
         yield "<thead><tr><th>Host</th><th>OS</th><th>Min Age</th></tr></thead>"
         yield "<tbody>"
 
@@ -675,7 +708,7 @@ class ViewHostPage(BuildFarmPage):
             try:
                 platform = self.buildfarm.hostdb[host].platform.encode("utf-8")
             except hostdb.NoSuchHost:
-                platform = "UNKNOWN"
+                continue
             yield "<tr><td>%s</td><td>%s</td><td>%s</td></tr>" %\
                     (host, platform, util.dhm_time(age))
 
@@ -694,16 +727,15 @@ class ViewSummaryPage(BuildFarmPage):
         # output when we want
         broken_table = ""
 
-        builds = self.buildfarm.get_last_builds()
+        builds = self.buildfarm.get_summary_builds(min_age=time.time() - BuildFarm.DEADAGE)
 
-        for build in builds:
-            host_count[build.tree]+=1
-            status = build.status()
+        for tree, status in builds:
+            host_count[tree]+=1
 
             if status.failed:
-                broken_count[build.tree]+=1
+                broken_count[tree]+=1
                 if "panic" in status.other_failures:
-                    panic_count[build.tree]+=1
+                    panic_count[tree]+=1
         return (host_count, broken_count, panic_count)
 
     def render_text(self, myself):
@@ -726,8 +758,8 @@ class ViewSummaryPage(BuildFarmPage):
 
         yield "<div id='build-counts' class='build-section'>"
         yield "<h2>Build counts:</h2>"
-        yield "<table class='real'>"
-        yield "<thead><tr><th>Tree</th><th>Total</th><th>Broken</th><th>Panic</th><th>Test coverage</th></tr></thead>"
+        yield "<table class='newtable'>"
+        yield "<thead><tr><th>Tree</th><th>Total</th><th>Broken</th><th>Panic</th><th>Test coverage</th><th></th></tr></thead>"
         yield "<tbody>"
 
         for tree in sorted(self.buildfarm.trees.keys()):
@@ -792,8 +824,8 @@ class HistoryPage(BuildFarmPage):
         <div class=\"diff\">
             <span class=\"html\"><a href=\"%s?function=diff;tree=%s;date=%s;%s\">show diffs</a></span>
         <br />
-            <span class=\"text\"><a href=\"%s?function=text_diff;tree=%s;date=%s;%s\">download diffs</a></span>
-            <br />
+            <span class=\"text\"><a href=\"%s?function=text_diff;tree=%s;date=%s;%s\">download diffs</a></span><br />
+            <span class=\"label\">Message:</span><br />
             <div class=\"history_log_message\">
                 <pre>%s</pre>
             </div>
@@ -825,8 +857,25 @@ class HistoryPage(BuildFarmPage):
         if builds:
             yield "<div class=\"builds\">\n"
             yield "<span class=\"label\">Builds: </span>\n"
+            yield "<table class=\"buildtable\">"
+            count=1
             for build in builds:
+                if count == 1:
+                    yield "<tr>"
+                yield "<td>"
                 yield "%s(%s) " % (build_link(myself, build), host_link(myself, build.host))
+                yield "</td>"
+                if count == 3:
+                    yield "</tr>"
+                    count = 1
+                else:
+                    count = count + 1
+            if count == 2:
+               yield "<td></td>"
+               yield "<td></td>"
+               yield "</tr>"
+               count = 1
+            yield "</table>"
             yield "</div>\n"
         yield "</div>\n"
 
@@ -848,19 +897,21 @@ class DiffPage(HistoryPage):
         changes = branch.changes_summary(revision)
         yield "".join(self.history_row_html(myself, entry, t, changes))
         diff = highlight(diff, DiffLexer(), HtmlFormatter())
-        yield "<pre>%s</pre>\n" % diff.encode("utf-8")
+        yield "<h2>Diff Result:</h2>"
+        yield "<pre>%s</pre>" % diff.encode("utf-8")
 
 
 class RecentCheckinsPage(HistoryPage):
 
-    limit = 40
+    limit = 10
 
-    def render(self, myself, tree, author=None):
+    def render(self, myself, tree, gitstart, author=None):
         t = self.buildfarm.trees[tree]
         interesting = list()
         authors = {"ALL": "ALL"}
         branch = t.get_branch()
         re_author = re.compile("^(.*) <(.*)>$")
+
         for entry in branch.log(limit=HISTORY_HORIZON):
             m = re_author.match(entry.author)
             authors[m.group(2)] = m.group(1)
@@ -870,46 +921,69 @@ class RecentCheckinsPage(HistoryPage):
         yield "<h2>Recent checkins for %s (%s branch %s)</h2>\n" % (
             tree, t.scm, t.branch)
         yield "<form method='GET'>"
+        yield "<div class='newform'>\n"
         yield "Select Author: "
         yield "".join(select(name="author", values=authors, default=author))
         yield "<input type='submit' name='sub_function' value='Refresh'/>"
         yield "<input type='hidden' name='tree' value='%s'/>" % tree
         yield "<input type='hidden' name='function', value='Recent Checkins'/>"
+        yield "</div>\n"
         yield "</form>"
 
-        for entry in interesting[:self.limit]:
+        gitstop = gitstart + self.limit
+
+        for entry in interesting[gitstart:gitstop]:
             changes = branch.changes_summary(entry.revision)
             yield "".join(self.history_row_html(myself, entry, t, changes))
         yield "\n"
 
+        yield "<form method='GET'>"
+        yield "<div class='newform'>\n"
+        if gitstart != 0:
+            yield "<button name='gitstart' type='submit' value=" + str(gitstart - self.limit) + " style='position:absolute;left:0px;'>Previous</button>"
+        if len(interesting) > gitstop:
+            yield "<button name='gitstart' type='submit' value=" + str(gitstop) + " style='position:absolute;right:0px;'>Next</button>"
+        yield "<input type='hidden' name='function', value='Recent Checkins'/>"
+        yield "<input type='hidden' name='gitcount' value='%s'/>" % gitstop
+        if author and author != "ALL":
+            yield "<input type='hidden' name='author' value='%s'/>" % author
+        yield "<input type='hidden' name='tree' value='%s'/>" % tree
+        yield "</div>\n"
+        yield "</form>"
+
 
 class BuildFarmApp(object):
 
     def __init__(self, buildfarm):
         self.buildfarm = buildfarm
 
-    def main_menu(self, tree, host, compiler):
+    def main_menu(self, tree, host, compiler, function):
         """main page"""
 
         yield "<form method='GET'>\n"
-        yield "<div id='build-menu'>\n"
+        yield "<div id='newbuildmenu'>\n"
         host_dict = {}
         for h in self.buildfarm.hostdb.hosts():
-            host_dict[h.name] = "%s -- %s" % (h.platform.encode("utf-8"), h.name)
+            host_dict[h.name] = "%s-%s" % (h.platform.encode("utf-8"), h.name)
         yield "".join(select("host", host_dict, default=host))
+        yield "<br/><br/>"
+
         tree_dict = {}
         for t in self.buildfarm.trees.values():
             tree_dict[t.name] = "%s:%s" % (t.name, t.branch)
         yield "".join(select("tree", tree_dict, default=tree))
+        yield "<br/><br/>"
         yield "".join(select("compiler", dict(zip(self.buildfarm.compilers, self.buildfarm.compilers)), default=compiler))
-        yield "<br/>\n"
-        yield "<input type='submit' name='function' value='View Build'/>\n"
-        yield "<input type='submit' name='function' value='View Host'/>\n"
-        yield "<input type='submit' name='function' value='Recent Checkins'/>\n"
-        yield "<input type='submit' name='function' value='Summary'/>\n"
-        yield "<input type='submit' name='function' value='Recent Builds'/>\n"
-        yield "</div>\n"
-        yield "</form>\n"
+        yield "<br/><br/>"
+        functions_dict = {
+            'View Build': 'View Build', 'Summary': 'Summary', 'View Host': 'View Host',
+            'Recent Builds': 'Recent Builds', 'Recent Checkins': 'Recent Checkins',
+            }
+        yield "".join(select("function", functions_dict, default=function))
+        yield "<br/><br/>"
+        yield "<br/><input type='submit' name='search' value='Go'/>"
+        yield "</div>"
+        yield "</form>"
 
     def html_page(self, form, lines):
         yield "<html>\n"
@@ -920,22 +994,29 @@ class BuildFarmApp(object):
         yield "    <meta name='description' contents='Home of the Samba Build Farm, the automated testing facility.'/>\n"
         yield "    <meta name='robots' contents='noindex'/>"
         yield "    <link rel='stylesheet' href='/build_farm.css' type='text/css' media='all'/>"
-        yield "    <link rel='stylesheet' href='http://www.samba.org/samba/style/common.css' type='text/css' media='all'/>"
-        yield "    <link rel='shortcut icon' href='http://www.samba.org/samba/images/favicon.ico'/>"
+        yield "    <link rel='shortcut icon' href='//www.samba.org/samba/images/favicon.ico'/>"
+        yield "    <link rel='shortcut icon' href='//www.samba.org/samba/style/2010/grey/favicon.ico'/>"
+        yield "    <link rel='stylesheet' type='text/css' media='screen,projection' href='//www.samba.org/samba/style/2010/grey/screen.css'/>"
+        yield "    <link rel='stylesheet' type='text/css' media='print' href='//www.samba.org/samba/style/2010/grey/print.css'/> "
         yield "  </head>"
         yield "<body>"
 
-        yield util.FileLoad(os.path.join(webdir, "header2.html"))
-
         tree = get_param(form, "tree")
         host = get_param(form, "host")
         compiler = get_param(form, "compiler")
-        yield "".join(self.main_menu(tree, host, compiler))
-        yield util.FileLoad(os.path.join(webdir, "header3.html"))
+        function = get_param(form, "function")
+        yield "".join(self.main_menu(tree, host, compiler, function))
+        yield util.FileLoad(os.path.join(webdir, "bannernav1.html"))
+        yield util.SambaWebFileLoad(os.path.join(webdir, "samba-web"), "menu_think_samba_closed.html")
+        yield util.SambaWebFileLoad(os.path.join(webdir, "samba-web"), "menu_get_samba_closed.html")
+        yield util.SambaWebFileLoad(os.path.join(webdir, "samba-web"), "menu_learn_samba_closed.html")
+        yield util.SambaWebFileLoad(os.path.join(webdir, "samba-web"), "menu_talk_samba_closed.html")
+        yield util.SambaWebFileLoad(os.path.join(webdir, "samba-web"), "menu_hack_samba_closed.html")
+        yield util.SambaWebFileLoad(os.path.join(webdir, "samba-web"), "menu_contact_samba_closed.html")
+        yield util.FileLoad(os.path.join(webdir, "bannernav2.html"))
         yield "".join(lines)
-        yield util.FileLoad(os.path.join(webdir, "footer.html"))
-        yield "</body>"
-        yield "</html>"
+        yield util.SambaWebFileLoad(os.path.join(webdir, "samba-web"), "footer.html")
+        yield util.FileLoad(os.path.join(webdir, "closingtags.html"))
 
     def __call__(self, environ, start_response):
         form = cgi.FieldStorage(fp=environ['wsgi.input'], environ=environ)
@@ -987,8 +1068,13 @@ class BuildFarmApp(object):
             elif fn_name == "Recent_Checkins":
                 # validate the tree
                 author = get_param(form, 'author')
+                gitstart = get_param(form, 'gitstart')
+                if gitstart is None:
+                    gitstart = 0
+                else:
+                    gitstart = int(gitstart)
                 page = RecentCheckinsPage(self.buildfarm)
-                yield "".join(self.html_page(form, page.render(myself, tree, author)))
+                yield "".join(self.html_page(form, page.render(myself, tree, gitstart, author)))
             elif fn_name == "diff":
                 revision = get_param(form, 'revision')
                 page = DiffPage(self.buildfarm)
@@ -1021,9 +1107,25 @@ class BuildFarmApp(object):
                     ('Content-type', 'text/html; charset=utf-8')])
                 page = ViewHostPage(self.buildfarm)
                 yield "".join(self.html_page(form, page.render_html(myself, wsgiref.util.shift_path_info(environ))))
+            elif fn == "about":
+                start_response('200 OK', [
+                    ('Content-type', 'text/html; charset=utf-8')])
+                lines = util.FileLoad(os.path.join(webdir, "about.html"))
+                yield "".join(self.html_page(form, lines))
+            elif fn == "instructions":
+                start_response('200 OK', [
+                    ('Content-type', 'text/html; charset=utf-8')])
+                lines = util.FileLoad(os.path.join(webdir, "instructions.html"))
+                yield "".join(self.html_page(form, lines))
             elif fn == "build":
                 build_checksum = wsgiref.util.shift_path_info(environ)
-                build = self.buildfarm.builds.get_by_checksum(build_checksum)
+                try:
+                    build = self.buildfarm.builds.get_by_checksum(build_checksum)
+                except NoSuchBuildError:
+                    start_response('404 Page Not Found', [
+                        ('Content-Type', 'text/html; charset=utf8')])
+                    yield "No build with checksum %s found" % build_checksum
+                    return
                 page = ViewBuildPage(self.buildfarm)
                 subfn = wsgiref.util.shift_path_info(environ)
                 if subfn == "+plain":
@@ -1058,10 +1160,17 @@ class BuildFarmApp(object):
                     import difflib
                     yield "".join(difflib.unified_diff(subunit_other, subunit_this))
 
-                elif subfn in ("", None):
+                elif subfn in ("", "limit", None):
+                    if subfn == "limit":
+                        try:
+                            limit = int(wsgiref.util.shift_path_info(environ))
+                        except:
+                            limit = 10
+                    else:
+                        limit = 10
                     start_response('200 OK', [
                         ('Content-type', 'text/html; charset=utf-8')])
-                    yield "".join(self.html_page(form, page.render(myself, build, False)))
+                    yield "".join(self.html_page(form, page.render(myself, build, False, limit)))
             elif fn in ("", None):
                 start_response('200 OK', [
                     ('Content-type', 'text/html; charset=utf-8')])
@@ -1076,6 +1185,8 @@ class BuildFarmApp(object):
 if __name__ == '__main__':
     import optparse
     parser = optparse.OptionParser("[options]")
+    parser.add_option("--debug-storm", help="Enable storm debugging",
+                      default=False, action='store_true')
     parser.add_option("--port", help="Port to listen on [localhost:8000]",
         default="localhost:8000", type=str)
     opts, args = parser.parse_args()
@@ -1103,6 +1214,9 @@ if __name__ == '__main__':
     except ValueError:
         address = "localhost"
         port = opts.port
+    if opts.debug_storm:
+        from storm.tracer import debug
+        debug(True, stream=sys.stdout)
     httpd = make_server(address, int(port), standaloneApp)
     print "Serving on %s:%d..." % (address, int(port))
     httpd.serve_forever()