From 2312d6873f0cef29708de07ac614f417f741d770 Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 11 Oct 2018 13:26:40 +0100
Subject: [PATCH] Drop using memcache

Everything can be saved on a higher level by the reverse proxy
in front of the webapp, too

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 Makefile.am              |  1 -
 requirements.txt         |  1 -
 src/backend/base.py      |  2 --
 src/backend/memcached.py | 50 ----------------------------------------
 src/backend/misc.py      |  4 ----
 src/web/handlers_base.py |  4 ----
 6 files changed, 62 deletions(-)
 delete mode 100644 src/backend/memcached.py

diff --git a/Makefile.am b/Makefile.am
index d0decf96..9454dca3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -57,7 +57,6 @@ backend_PYTHON = \
 	src/backend/fireinfo.py \
 	src/backend/geoip.py \
 	src/backend/iuse.py \
-	src/backend/memcached.py \
 	src/backend/mirrors.py \
 	src/backend/misc.py \
 	src/backend/netboot.py \
diff --git a/requirements.txt b/requirements.txt
index 35cc3eb4..6acba5aa 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -13,7 +13,6 @@ pyasn1==0.4.4
 pyasn1-modules==0.2.2
 pycurl==7.43.0
 python-ldap==3.1.0
-python3-memcached==1.51
 six==1.11.0
 textile==3.0.3
 tornado==4.4.2
diff --git a/src/backend/base.py b/src/backend/base.py
index 5705ff7e..d7d6e328 100644
--- a/src/backend/base.py
+++ b/src/backend/base.py
@@ -8,7 +8,6 @@ from . import database
 from . import geoip
 from . import fireinfo
 from . import iuse
-from . import memcached
 from . import mirrors
 from . import netboot
 from . import nopaste
@@ -41,7 +40,6 @@ class Backend(object):
 
 		# 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 25ff030b..00000000
--- a/src/backend/memcached.py
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/usr/bin/python
-
-import logging
-import memcache
-
-from .misc import Object
-
-class Memcached(Object):
-	def init(self):
-		self._connection = None
-
-		servers = self.get_servers()
-
-		# Nothing to do, if no servers have been configured.
-		if not servers:
-			logging.warning("No memcache servers defined")
-			return
-
-		logging.info("Using memcache servers: %s" % ", ".join(servers))
-		self._connection = memcache.Client(servers, debug=0)
-
-	def get_servers(self):
-		servers = self.settings.get("memcached_servers")
-
-		if servers:
-			return servers.split(" ")
-
-	def get(self, key, *args, **kwargs):
-		if not self._connection:
-			return
-
-		key = str(key)
-
-		return self._connection.get(key, *args, **kwargs)
-
-	def set(self, key, *args, **kwargs):
-		if not self._connection:
-			return
-
-		key = str(key)
-
-		return self._connection.set(key, *args, **kwargs)
-
-	def delete(self, key, *args, **kwargs):
-		if not self._connection:
-			return
-
-		key = str(key)
-
-		return self._connection.delete(key, *args, **kwargs)
diff --git a/src/backend/misc.py b/src/backend/misc.py
index c4b04807..80f571b1 100644
--- a/src/backend/misc.py
+++ b/src/backend/misc.py
@@ -36,10 +36,6 @@ class Object(object):
 	def iuse(self):
 		return self.backend.iuse
 
-	@property
-	def memcache(self):
-		return self.backend.memcache
-
 	@property
 	def planet(self):
 		return self.backend.planet
diff --git a/src/web/handlers_base.py b/src/web/handlers_base.py
index 2731a915..6c40868d 100644
--- a/src/web/handlers_base.py
+++ b/src/web/handlers_base.py
@@ -139,10 +139,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.47.3