From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 6 Oct 2017 17:26:23 +0000 (+0100)
Subject: Cleanup uploads a few times a day
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=be8d5956402170f4f35ea609e41ab1c7dc95770e;p=pbs.git

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 5db80568..9d1f2b2b 100644
--- 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 b70bfb4b..03bdf647 100644
--- 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
index c0084555..00000000
--- 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 36d948d7..94aa7f7d 100644
--- 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 0aff75fe..428fe19d 100644
--- 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.