diff --git a/src/controllers/admin/cache.js b/src/controllers/admin/cache.js index fadec76338..840ff65efa 100644 --- a/src/controllers/admin/cache.js +++ b/src/controllers/admin/cache.js @@ -9,7 +9,6 @@ cacheController.get = function (req, res) { const groupCache = require('../../groups').cache; const objectCache = require('../../database').objectCache; const localCache = require('../../cache'); - const headerFooterCache = require('../../middleware').headerFooterCache; function getInfo(cache) { return { @@ -28,7 +27,6 @@ cacheController.get = function (req, res) { postCache: getInfo(postCache), groupCache: getInfo(groupCache), localCache: getInfo(localCache), - headerFooterCache: getInfo(headerFooterCache), }; if (objectCache) { @@ -44,7 +42,6 @@ cacheController.dump = function (req, res, next) { object: require('../../database').objectCache, group: require('../../groups').cache, local: require('../../cache'), - headerfooter: require('../../middleware').headerFooterCache, }; if (!caches[req.query.name]) { return next(); diff --git a/src/middleware/render.js b/src/middleware/render.js index 05950e13c0..44a0689c0b 100644 --- a/src/middleware/render.js +++ b/src/middleware/render.js @@ -10,19 +10,10 @@ const translator = require('../translator'); const widgets = require('../widgets'); const utils = require('../utils'); const slugify = require('../slugify'); -const cacheCreate = require('../cacheCreate'); -const cache = cacheCreate({ - name: 'header-footer', - max: 1000, - maxAge: 0, - enabled: global.env === 'production', -}); const relative_path = nconf.get('relative_path'); module.exports = function (middleware) { - middleware.headerFooterCache = cache; - middleware.processRender = function processRender(req, res, next) { // res.render post-processing, modified from here: https://gist.github.com/mrlannigan/5051687 const render = res.render; @@ -104,34 +95,14 @@ module.exports = function (middleware) { async function renderHeaderFooter(method, req, res, options) { let str = ''; - const lang = getLang(req, res); - function getCacheKey() { - return [lang, method] - .concat(req.path.split('/').slice(0, 4)) - .join('/'); - } - let cacheKey; - if (req.uid === 0 && res.locals.renderHeader) { - cacheKey = getCacheKey(); - str = cache.get(cacheKey); - if (str) { - return str; - } - } - if (!str) { - if (res.locals.renderHeader) { - str = await middleware[method](req, res, options); - } else if (res.locals.renderAdminHeader) { - str = await middleware.admin[method](req, res, options); - } else { - str = ''; - } - } - const translated = await translate(str, lang); - if (req.uid === 0 && res.locals.renderHeader) { - cache.set(cacheKey, translated, 300000); + if (res.locals.renderHeader) { + str = await middleware[method](req, res, options); + } else if (res.locals.renderAdminHeader) { + str = await middleware.admin[method](req, res, options); + } else { + str = ''; } - return translated; + return await translate(str, getLang(req, res)); } function getLang(req, res) { diff --git a/src/socket.io/admin/cache.js b/src/socket.io/admin/cache.js index de16f8faaf..534cefeac8 100644 --- a/src/socket.io/admin/cache.js +++ b/src/socket.io/admin/cache.js @@ -11,8 +11,6 @@ SocketCache.clear = async function (socket, data) { require('../../groups').cache.reset(); } else if (data.name === 'local') { require('../../cache').reset(); - } else if (data.name === 'headerfooter') { - require('../../middleware').headerFooterCache.reset(); } }; @@ -22,7 +20,6 @@ SocketCache.toggle = async function (socket, data) { object: require('../../database').objectCache, group: require('../../groups').cache, local: require('../../cache'), - headerfooter: require('../../middleware').headerFooterCache, }; if (!caches[data.name]) { return; diff --git a/src/views/admin/advanced/cache.tpl b/src/views/admin/advanced/cache.tpl index 32b7371fdb..46205e5fef 100644 --- a/src/views/admin/advanced/cache.tpl +++ b/src/views/admin/advanced/cache.tpl @@ -2,7 +2,7 @@