Merge Pakfire Hub into the main webapp

[pbs.git] / src / buildservice / builders.py

diff --git a/src/buildservice/builders.py b/src/buildservice/builders.py
index 15dc856a1916d4ac0f16e9f1b68e94ce12ca93c3..ccf17403953a5156684ca8ef216a0879de05c948 100644 (file)
--- a/src/buildservice/builders.py
+++ b/src/buildservice/builders.py
@@ -214,8 +214,17 @@ class Builder(base.DataObject):
 
        online_until = property(lambda s: s.data.online_until, set_online_until)
 
-       def update_info(self, cpu_model=None, cpu_count=None, cpu_arch=None,
-                       pakfire_version=None, os_name=None):
+       def log_stats(self, cpu_model=None, cpu_count=None, cpu_arch=None, pakfire_version=None,
+                       os_name=None, cpu_user=None, cpu_nice=None, cpu_system=None, cpu_idle=None,
+                       cpu_iowait=None, cpu_irq=None, cpu_softirq=None, cpu_steal=None, cpu_guest=None,
+                       cpu_guest_nice=None, loadavg1=None, loadavg5=None, loadavg15=None, mem_total=None,
+                       mem_available=None, mem_used=None, mem_free=None, mem_active=None, mem_inactive=None,
+                       mem_buffers=None, mem_cached=None, mem_shared=None, swap_total=None, swap_used=None,
+                       swap_free=None, **kwargs):
+               """
+                       Logs some stats about this builder
+               """
+               # Update information
                self.db.execute("""
                        UPDATE
                                builders
@@ -236,14 +245,7 @@ class Builder(base.DataObject):
                        self.id,
                )
 
-       def log_stats(self, cpu_user, cpu_nice, cpu_system, cpu_idle, cpu_iowait,
-                       cpu_irq, cpu_softirq, cpu_steal, cpu_guest, cpu_guest_nice,
-                       loadavg1, loadavg5, loadavg15, mem_total, mem_available, mem_used,
-                       mem_free, mem_active, mem_inactive, mem_buffers, mem_cached, mem_shared,
-                       swap_total, swap_used, swap_free):
-               """
-                       Logs some stats about this builder
-               """
+               # Log Stats
                self.db.execute("""
                        INSERT INTO
                                builder_stats