Cleanup uploads a few times a day

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

diff --git a/src/crontab/pakfire-build-service b/src/crontab/pakfire-build-service
index 5db80568a97eeef9c0d47a3344925eb694b642b0..9d1f2b2b2015a17e0d142c613dd41411f75027dd 100644 (file)
--- a/src/crontab/pakfire-build-service
+++ b/src/crontab/pakfire-build-service
@@ -1,2 +1,5 @@
 # Send queued emails once a minute
 * * * * *      nobody  pakfire-build-service process-message-queue &>/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 b70bfb4b3773d78bb8fec6e469cce0b6a8aac785..03bdf647b5f2befdb8297bd5fab356bbda21ab65 100644 (file)
--- a/src/manager/__init__.py
+++ b/src/manager/__init__.py
@@ -8,7 +8,6 @@ from .builds       import CreateTestBuildsEvent, DistEvent
 from .repositories import RepositoriesUpdateEvent
 from .sessions     import SessionsCleanupEvent
 from .sources      import SourcesPullEvent
-from .uploads      import UploadsCleanupEvent
 
 
 # Events that do not fit anywhere else.

diff --git a/src/manager/uploads.py b/src/manager/uploads.py
deleted file mode 100644 (file)
index c008455..0000000
--- a/src/manager/uploads.py
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/python
-
-from . import base
-
-class UploadsCleanupEvent(base.Event):
-       interval = 3600
-
-       # Rather unimportant when this runs.
-       priority = 10
-
-       def run(self):
-               self.pakfire.uploads.cleanup()

diff --git a/src/scripts/pakfire-build-service b/src/scripts/pakfire-build-service
index 36d948d761748c5a937b6aea27fdc08c3ac848c8..94aa7f7de3de4a99bfa4c626ce56ea9948b4b7ec 100644 (file)
--- a/src/scripts/pakfire-build-service
+++ b/src/scripts/pakfire-build-service
@@ -14,6 +14,9 @@ class Cli(object):
                self.backend = pakfire.buildservice.Backend(*args, **kwargs)
 
                self._commands = {
+                       # Cleanup uploads
+                       "cleanup-uploads" : self.backend.uploads.cleanup,
+
                        # Sends all queued messages
                        "process-message-queue" : self.backend.messages.process_queue,
                }

diff --git a/src/scripts/pakfire-manager b/src/scripts/pakfire-manager
index 0aff75fe397aa42acec9e4b2af6505470ea2a363..428fe19d89a1ba42333daf25dc51d6543098f010 100644 (file)
--- a/src/scripts/pakfire-manager
+++ b/src/scripts/pakfire-manager
@@ -25,7 +25,6 @@ events = (
        pakfire.buildservice.manager.RepositoriesUpdateEvent,
        pakfire.buildservice.manager.SessionsCleanupEvent,
        pakfire.buildservice.manager.SourcesPullEvent,
-       pakfire.buildservice.manager.UploadsCleanupEvent,
 )
 
 # Add all events to the scheduler.