builders: Rename active_jobs to jobs

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/buildservice/builders.py b/src/buildservice/builders.py
index d52498dd64b54a07f036ce5c1e1ab08104616c9d..d957168df5545b502147dedc742468ae4bb83b90 100644 (file)
--- a/src/buildservice/builders.py
+++ b/src/buildservice/builders.py
@@ -344,10 +344,37 @@ class Builder(base.DataObject):
 
        testmode = property(lambda s: s.data.testmode, set_testmode)
 
+       # Jobs
+
+       @property
+       def jobs(self):
+               jobs = self.backend.jobs._get_jobs("""
+                       SELECT
+                               jobs.*
+                       FROM
+                               jobs
+                       WHERE
+                               time_started IS NOT NULL
+                       AND
+                               time_finished IS NULL
+                       AND
+                               builder_id = %s
+                       ORDER BY
+                               time_started""",
+                       self.id,
+               )
+
+               return list(jobs)
+
+       # Max Jobs
+
+       def get_max_jobs(self):
+               return self.data.max_jobs
+
        def set_max_jobs(self, value):
                self._set_attribute("max_jobs", value)
 
-       max_jobs = property(lambda s: s.data.max_jobs, set_max_jobs)
+       max_jobs = property(get_max_jobs, set_max_jobs)
 
        @property
        def name(self):
@@ -398,26 +425,6 @@ class Builder(base.DataObject):
 
                return "online"
 
-       @lazy_property
-       def active_jobs(self):
-               jobs = self.backend.jobs._get_jobs("""
-                       SELECT
-                               jobs.*
-                       FROM
-                               jobs
-                       WHERE
-                               time_started IS NOT NULL
-                       AND
-                               time_finished IS NULL
-                       AND
-                               builder_id = %s
-                       ORDER BY
-                               time_started""",
-                       self.id,
-               )
-
-               return list(jobs)
-
        def get_history(self, *args, **kwargs):
                kwargs["builder"] = self
 
@@ -429,7 +436,7 @@ class Builder(base.DataObject):
                        return False
 
                # Does this builder have reached its job limit?
-               if len(self.active_jobs) >= self.max_jobs:
+               if len(self.jobs) >= self.max_jobs:
                        return False
 
                # Looks like we are ready

diff --git a/src/templates/builders/detail.html b/src/templates/builders/detail.html
index 40dc25ee2ab2d8c87a68e43c518375fee3df0d69..f9263128ca4422a994c4083844c92ce6abb91b93 100644 (file)
--- a/src/templates/builders/detail.html
+++ b/src/templates/builders/detail.html
@@ -72,7 +72,7 @@
 
                        <div class="cell large-4 text-center">
                                <h1>
-                                       {{ len(builder.active_jobs) }}
+                                       {{ len(builder.jobs) }}
                                        <small>/ {{ builder.max_jobs }}</small>
                                </h1>
                                <h5>{{ _("Jobs") }}</h5>
@@ -88,10 +88,10 @@
 
        <!-- XXX add some realtime graph -->
 
-       {% if builder.active_jobs %}
+       {% if builder.jobs %}
                <h5>{{ _("Running Jobs") }}</h5>
 
-               {% module JobsList(builder.active_jobs) %}
+               {% module JobsList(builder.jobs) %}
        {% end %}
 
        {% if log %}