Drop memcache

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/Makefile.am b/Makefile.am
index b05358f9c9db7dbdd2091b0fd8acce6278fe076e..773fa00f3b405fa9106cb51b6e1ae269f8fb8ca4 100644 (file)
--- 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 6e816987b88c1ce874b0169d31ec5c14e379c759..d7e1e0f756efa97c8b64fe5d5bfebe0442d14657 100644 (file)
--- 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 (file)
index 56a8cc8..0000000
--- 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 4960e3070b7bd26cea93310a99fad76f2112de82..12474435309f01f56336c185e30e259229f0b176 100644 (file)
--- 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 ce7202c4e95601d77658b33ce0cde908afe5b6b6..fa4193792aafdcfa96eb376be06b3e5031bbcca9 100644 (file)
--- 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