blog: Use upstream cache to cache generated feed

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

diff --git a/src/web/blog.py b/src/web/blog.py
index 5b7dc4a1a35f7c863fa9549a2eedf122407599b8..9ce9a6d5d19f5f735b17b0ff5483be11777a061b 100644 (file)
--- a/src/web/blog.py
+++ b/src/web/blog.py
@@ -31,19 +31,14 @@ class AuthorHandler(base.BaseHandler):
 
 class FeedHandler(base.BaseHandler):
        def get(self):
-               cache_key = "%s-%s" % (self.request.host, self.request.path)
+               posts = self.backend.blog.get_newest(limit=50)
 
-               # Get feed from cache if possible
-               feed = self.memcached.get(cache_key)
-               if not feed:
-                       posts = self.backend.blog.get_newest(limit=50)
+               # Render the feed
+               feed = self.render_string("blog/feed.xml", posts=posts,
+                       now=email.utils.formatdate())
 
-                       # Render the feed
-                       feed = self.render_string("blog/feed.xml", posts=posts,
-                               now=email.utils.formatdate())
-
-                       # Store in cache for 5min
-                       self.memcached.set(cache_key, feed, 300)
+               # Allow this to be cached for 5 minutes
+               self.set_expires(300)
 
                # Set correct content type
                self.set_header("Content-Type", "application/rss+xml")