backend: Move cleanup job into the main thread

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

diff --git a/src/buildservice/__init__.py b/src/buildservice/__init__.py
index bb9502fe6284f0bd3be783735c143055a7c923b7..862ed46b42aa615af273779870a011f73a24d523 100644 (file)
--- a/src/buildservice/__init__.py
+++ b/src/buildservice/__init__.py
@@ -114,6 +114,9 @@ class Backend(object):
                # Regularly check for new releases
                self.run_periodic_task(300, self.monitorings.check)
 
+               # Cleanup regularly
+               self.run_periodic_task(3600, self.cleanup)
+
        def read_config(self, path):
                c = configparser.ConfigParser()
 

diff --git a/src/crontab/pakfire-build-service b/src/crontab/pakfire-build-service
index cb8550075ca9265141db92895bac6a9f80965a05..871fd5a364678dd390817142eb5d3f0b4c26606f 100644 (file)
--- a/src/crontab/pakfire-build-service
+++ b/src/crontab/pakfire-build-service
@@ -2,6 +2,3 @@ MAILTO=pakfire@ipfire.org
 
 # Send queued emails once a minute
 * * * * *              _pakfire        pakfire-build-service --logging=warning messages:queue:send
-
-# Cleanup
-*/5 * * * *            _pakfire        pakfire-build-service --logging=warning cleanup