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>

diff --git a/Makefile.am b/Makefile.am
index d0decf9693147fef46f49215e633023d697a2dc3..9454dca354143d33015d599a25385ea2f426f2c7 100644 (file)
--- 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 35cc3eb421b4235503f4fa03b2e43354c9ef449e..6acba5aae343ce77a9be8a139e0277ee7959e9c9 100644 (file)
--- 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 5705ff7ea2ec3c639050dc6c39b7ff6bb425bdfb..d7d6e328984da06dcbccd60fc6e5b977bbefdb73 100644 (file)
--- 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 (file)
index 25ff030..0000000
--- 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 c4b0480795c2973990f9566be8e58ca3b39af93d..80f571b10aff7a42b1ec466ae587bbc6709075f1 100644 (file)
--- 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 2731a915f1df2c6e685fb1c0d7ddfdd838137a62..6c40868d30d3acb599ae494a45017e7463d5de13 100644 (file)
--- 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