From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 6 Oct 2017 17:29:48 +0000 (+0100)
Subject: Cleanup expired sessions once a day
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ca4f2d92249ce5fa64922706bdcde13abb839197;p=pbs.git

Cleanup expired sessions once 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 9d1f2b2b..e98eb806 100644
--- a/src/crontab/pakfire-build-service
+++ b/src/crontab/pakfire-build-service
@@ -3,3 +3,6 @@
 
 # Cleanup timed-out uploads
 0 */6 * * *	nobody	pakfire-build-service cleanup-uploads &>/dev/null
+
+# Cleanup expired sessions
+0 0 * * *	nobody	pakfire-build-service cleanup-sessions &>/dev/null
diff --git a/src/manager/__init__.py b/src/manager/__init__.py
index 03bdf647..6baa0956 100644
--- a/src/manager/__init__.py
+++ b/src/manager/__init__.py
@@ -6,7 +6,6 @@ from .bugs         import BugsUpdateEvent
 from .builds       import BuildsFailedRestartEvent, CheckBuildDependenciesEvent
 from .builds       import CreateTestBuildsEvent, DistEvent
 from .repositories import RepositoriesUpdateEvent
-from .sessions     import SessionsCleanupEvent
 from .sources      import SourcesPullEvent
 
 
diff --git a/src/manager/sessions.py b/src/manager/sessions.py
deleted file mode 100644
index 1d5579e2..00000000
--- a/src/manager/sessions.py
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/python
-
-from . import base
-
-class SessionsCleanupEvent(base.Event):
-	"""
-		Cleans up sessions that are not valid anymore.
-		Keeps the database smaller.
-	"""
-	# Run once in an hour.
-	interval = 3600
-
-	# Rather unimportant when this runs.
-	priority = 10
-
-	def run(self):
-		self.pakfire.sessions.cleanup()
diff --git a/src/scripts/pakfire-build-service b/src/scripts/pakfire-build-service
index 94aa7f7d..c6a23c91 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 sessions
+			"cleanup-sessions" : self.backend.sessions.cleanup,
+
 			# Cleanup uploads
 			"cleanup-uploads" : self.backend.uploads.cleanup,
 
diff --git a/src/scripts/pakfire-manager b/src/scripts/pakfire-manager
index 428fe19d..42f1aa91 100644
--- a/src/scripts/pakfire-manager
+++ b/src/scripts/pakfire-manager
@@ -23,7 +23,6 @@ events = (
 	pakfire.buildservice.manager.CreateTestBuildsEvent,
 	pakfire.buildservice.manager.DistEvent,
 	pakfire.buildservice.manager.RepositoriesUpdateEvent,
-	pakfire.buildservice.manager.SessionsCleanupEvent,
 	pakfire.buildservice.manager.SourcesPullEvent,
 )