From: Michael Tremer Date: Sun, 8 Oct 2017 14:00:05 +0000 (+0100) Subject: Regularly cleanup files X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0f3020585cf174676eacb616f5db0d2e6ef13364;p=people%2Fjschlag%2Fpbs.git Regularly cleanup files Signed-off-by: Michael Tremer --- diff --git a/src/crontab/pakfire-build-service b/src/crontab/pakfire-build-service index 84b598d..602de7e 100644 --- a/src/crontab/pakfire-build-service +++ b/src/crontab/pakfire-build-service @@ -4,6 +4,9 @@ # Send updates to Bugzilla */5 * * * * nobody pakfire-build-service send-bug-updates &>/dev/null +# Cleanup files +*/5 * * * * nobody pakfire-build-service cleanup-files &>/dev/null + # Cleanup timed-out uploads 0 */6 * * * nobody pakfire-build-service cleanup-uploads &>/dev/null diff --git a/src/manager/__init__.py b/src/manager/__init__.py index d59e557..096e26a 100644 --- a/src/manager/__init__.py +++ b/src/manager/__init__.py @@ -1,25 +1,6 @@ #!/usr/bin/python -from . import base - from .builds import BuildsFailedRestartEvent, CheckBuildDependenciesEvent from .builds import CreateTestBuildsEvent, DistEvent from .repositories import RepositoriesUpdateEvent from .sources import SourcesPullEvent - - -# Events that do not fit anywhere else. - -class CleanupFilesEvent(base.Event): - """ - Removes all files that are not needed anymore. - (scratch builds, logs, etc.) - """ - # Run once in 5 minutes. - interval = 300 - - # Intermediate priority. - priority = 5 - - def run(self): - self.pakfire.cleanup_files() diff --git a/src/scripts/pakfire-build-service b/src/scripts/pakfire-build-service index 20c93e6..7b39ef4 100644 --- a/src/scripts/pakfire-build-service +++ b/src/scripts/pakfire-build-service @@ -17,6 +17,9 @@ class Cli(object): # Run mirror check "check-mirrors" : self.backend.mirrors.check, + # Cleanup files + "cleanup-files" : self.backend.cleanup_files, + # Cleanup sessions "cleanup-sessions" : self.backend.sessions.cleanup,