From 96ccd5d596078543d9e5c5c17503b8837fd68c1d Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Sat, 14 Apr 2012 17:19:21 +0200 Subject: [PATCH] Send hardware information to the hub at start of the daemon. --- python/pakfire/builder.py | 3 +++ python/pakfire/client/base.py | 4 ++-- python/pakfire/client/builder.py | 5 +++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/python/pakfire/builder.py b/python/pakfire/builder.py index 5a0ea0a29..494049e01 100644 --- a/python/pakfire/builder.py +++ b/python/pakfire/builder.py @@ -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() diff --git a/python/pakfire/client/base.py b/python/pakfire/client/base.py index dc08f674c..632ec8bbd 100644 --- a/python/pakfire/client/base.py +++ b/python/pakfire/client/base.py @@ -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() diff --git a/python/pakfire/client/builder.py b/python/pakfire/client/builder.py index 4bdaf45e9..a039e65f9 100644 --- a/python/pakfire/client/builder.py +++ b/python/pakfire/client/builder.py @@ -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, } -- 2.39.5