]> git.ipfire.org Git - pakfire.git/commitdiff
Send hardware information to the hub at start of the daemon.
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 14 Apr 2012 15:19:21 +0000 (17:19 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 14 Apr 2012 15:19:21 +0000 (17:19 +0200)
python/pakfire/builder.py
python/pakfire/client/base.py
python/pakfire/client/builder.py

index 5a0ea0a2990268e50d68af5bee96c5eaea110348..494049e015c29be2d355483d3177c8fe829252d3 100644 (file)
@@ -219,6 +219,9 @@ class BuildEnviron(object):
                # Save the build time.
                self.build_time = int(time.time())
 
+       def setup_signal_handlers(self):
+               pass
+
        def start(self):
                # Mount the directories.
                self._mountall()
index dc08f674c38bfcab672a2cdc83a760b2948e231b..632ec8bbd172c68a57ba480c0d3e7f484536d34a 100644 (file)
@@ -193,7 +193,7 @@ class PakfireUserClient(BuildMixin, PakfireClient):
 class PakfireBuilderClient(BuildMixin, PakfireClient):
        type = "builder"
 
-       def send_keepalive(self, overload=None, free_space=None):
+       def send_keepalive(self, force=False, overload=None, free_space=None):
                """
                        Sends a little keepalive to the server and
                        updates the hardware information if the server
@@ -206,7 +206,7 @@ class PakfireBuilderClient(BuildMixin, PakfireClient):
 
                needs_update = self.conn.send_keepalive(loadavg, overload, free_space)
 
-               if needs_update:
+               if force or needs_update:
                        log.debug("The hub is requesting an update.")
                        self.send_update()
 
index 4bdaf45e9f5220043dfec3eabc43a1c96f77cc91..a039e65f962dd8785141952dddb1a6d6a762cbcb 100644 (file)
@@ -71,7 +71,7 @@ class PakfireDaemon(object):
                        self._last_keepalive = 0
 
                        # Send an initial keepalive message.
-                       self.send_keepalive()
+                       self.send_keepalive(force=True)
 
                def run(self, heartbeat=1, max_processes=None):
                        # By default do not start more than two processes per CPU core.
@@ -205,7 +205,7 @@ class PakfireDaemon(object):
                        # a new job.
                        return load5 >= system.cpu_count * 2
 
-               def send_keepalive(self):
+               def send_keepalive(self, force=False):
                        """
                                When triggered, this method sends a keepalive to the hub.
                        """
@@ -214,6 +214,7 @@ class PakfireDaemon(object):
                                return
 
                        kwargs = {
+                               "force"      : force,
                                "overload"   : self.has_overload(),
                                "free_space" : self.free_space / 1024**2,
                        }