From 4f043f793a5b870aac7bc91eea98fd18bc65bec7 Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 25 Oct 2023 15:14:06 +0000
Subject: [PATCH] Drop memcache

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 Makefile.am              |  1 -
 src/backend/base.py      |  4 +--
 src/backend/memcached.py | 75 ----------------------------------------
 src/backend/misc.py      |  4 ---
 src/web/base.py          |  4 ---
 5 files changed, 1 insertion(+), 87 deletions(-)
 delete mode 100644 src/backend/memcached.py

diff --git a/Makefile.am b/Makefile.am
index b05358f9..773fa00f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -62,7 +62,6 @@ backend_PYTHON = \
 	src/backend/httpclient.py \
 	src/backend/hwdata.py \
 	src/backend/iuse.py \
-	src/backend/memcached.py \
 	src/backend/messages.py \
 	src/backend/mirrors.py \
 	src/backend/misc.py \
diff --git a/src/backend/base.py b/src/backend/base.py
index 6e816987..d7e1e0f7 100644
--- a/src/backend/base.py
+++ b/src/backend/base.py
@@ -17,7 +17,6 @@ from . import database
 from . import fireinfo
 from . import httpclient
 from . import iuse
-from . import memcached
 from . import messages
 from . import mirrors
 from . import netboot
@@ -60,9 +59,8 @@ class Backend(object):
 		# Initialize the cache
 		self.cache = cache.Cache(self)
 
-		# Initialize settings first.
+		# Initialize settings first
 		self.settings = settings.Settings(self)
-		self.memcache = memcached.Memcached(self)
 
 		# Initialize backend modules.
 		self.accounts = accounts.Accounts(self)
diff --git a/src/backend/memcached.py b/src/backend/memcached.py
deleted file mode 100644
index 56a8cc80..00000000
--- a/src/backend/memcached.py
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/usr/bin/python
-
-import logging
-import memcache
-
-from .misc import Object
-
-class Memcached(Object):
-	def init(self):
-		self._connection = memcache.Client(["localhost"], debug=1)
-
-	def get(self, key, *args, **kwargs):
-		key = self._sanitize_key(key)
-
-		logging.debug("Retrieving %s from cache..." % key)
-
-		ret = self._connection.get(key, *args, **kwargs)
-
-		if ret is None:
-			logging.debug("Found nothing for %s" % key)
-		else:
-			logging.debug("Found object for %s" % key)
-
-		return ret
-
-	def get_multi(self, keys, *args, **kwargs):
-		keys = (self._sanitize_key(key) for key in keys)
-
-		logging.debug("Retrieving keys from cache: %s" % keys)
-
-		ret = self._connection.get_multi(keys, *args, **kwargs)
-
-		if ret is None:
-			logging.debug("Found nothing for %s" % keys)
-		else:
-			logging.debug("Found objects for %s" % keys)
-
-		return ret
-
-	def add(self, key, data, *args, **kwargs):
-		key = self._sanitize_key(key)
-
-		if data is None:
-			logging.debug("Putting nothing into cache for %s" % key)
-		else:
-			logging.debug("Putting object into cache for %s" % key)
-
-		return self._connection.add(key, data, *args, **kwargs)
-
-	def set(self, key, data, *args, **kwargs):
-		key = self._sanitize_key(key)
-
-		if data is None:
-			logging.debug("Putting nothing into cache for %s" % key)
-		else:
-			logging.debug("Putting object into cache for %s" % key)
-
-		return self._connection.set(key, data, *args, **kwargs)
-
-	def delete(self, key, *args, **kwargs):
-		key = self._sanitize_key(key)
-
-		return self._connection.delete(key, *args, **kwargs)
-
-	def incr(self, key):
-		key = self._sanitize_key(key)
-
-		logging.debug("Incrementing key %s" % key)
-
-		return self._connection.incr(key)
-
-	@staticmethod
-	def _sanitize_key(key):
-		# Memcache does not seem to like any spaces
-		return key.replace(" ", "-")
diff --git a/src/backend/misc.py b/src/backend/misc.py
index 4960e307..12474435 100644
--- a/src/backend/misc.py
+++ b/src/backend/misc.py
@@ -34,10 +34,6 @@ class Object(object):
 	def iuse(self):
 		return self.backend.iuse
 
-	@property
-	def memcache(self):
-		return self.backend.memcache
-
 	@property
 	def settings(self):
 		return self.backend.settings
diff --git a/src/web/base.py b/src/web/base.py
index ce7202c4..fa419379 100644
--- a/src/web/base.py
+++ b/src/web/base.py
@@ -218,10 +218,6 @@ class BaseHandler(tornado.web.RequestHandler):
 	def iuse(self):
 		return self.backend.iuse
 
-	@property
-	def memcached(self):
-		return self.backend.memcache
-
 	@property
 	def mirrors(self):
 		return self.backend.mirrors
-- 
2.39.2