From 24fb6cfe7e6a98c48fdb73c9926d85006d70fcc0 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Tue, 19 Aug 2014 07:42:13 +0200 Subject: [PATCH] Revert "Reuse DEADAGE rather than defining our own constant." This reverts commit b60f215d1fa2f04bee4c650efbba629a215fda6f. This generates the following error: Traceback (most recent call last): File "/usr/lib/python2.6/wsgiref/handlers.py", line 94, in run self.finish_response() File "/usr/lib/python2.6/wsgiref/handlers.py", line 134, in finish_response for data in self.result: File "/home/build/master/web/../buildfarm/web/__init__.py", line 1178, in __call__ yield "".join(self.html_page(form, page.render_html(myself))) File "/home/build/master/web/../buildfarm/web/__init__.py", line 1017, in html_page yield "".join(lines) File "/home/build/master/web/../buildfarm/web/__init__.py", line 757, in render_html (host_count, broken_count, panic_count) = self._get_counts() File "/home/build/master/web/../buildfarm/web/__init__.py", line 730, in _get_counts builds = self.buildfarm.get_summary_builds(min_age=time.time() - BuildFarm.DEADAGE) NameError: global name 'BuildFarm' is not defined Signed-off-by: Stefan Metzmacher --- TODO | 1 - buildfarm/web/__init__.py | 7 ++++++- 2 files changed, 6 insertions(+), 2 deletions(-) delete mode 100644 TODO diff --git a/TODO b/TODO deleted file mode 100644 index 1480b02e..00000000 --- a/TODO +++ /dev/null @@ -1 +0,0 @@ -- age is misnamed diff --git a/buildfarm/web/__init__.py b/buildfarm/web/__init__.py index 8794978b..7ba04c51 100755 --- a/buildfarm/web/__init__.py +++ b/buildfarm/web/__init__.py @@ -58,6 +58,11 @@ webdir = os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "..", "we GITWEB_BASE = "//gitweb.samba.org" HISTORY_HORIZON = 1000 +# Maximum age of builds to consider when displaying summary page statistics. +# Note that trees only get rebuilt when they change, so this value is +# intentionally set to a high value to cope with trees that don't change often. +SUMMARY_MAX_BUILD_AGE = (180 * 24 * 60 * 60) + # this is automatically filled in deadhosts = [] @@ -727,7 +732,7 @@ class ViewSummaryPage(BuildFarmPage): # output when we want broken_table = "" - builds = self.buildfarm.get_summary_builds(min_age=time.time() - BuildFarm.DEADAGE) + builds = self.buildfarm.get_summary_builds(min_age=time.time() - SUMMARY_MAX_BUILD_AGE) for tree, status in builds: host_count[tree]+=1 -- 2.34.1