Check follow constraints when getting a video

[github/Chocobozzz/PeerTube.git] / server / middlewares / cache.ts

diff --git a/server/middlewares/cache.ts b/server/middlewares/cache.ts
index c671b88c954f74fbb06ca9f255e9da5b03d3e28d..8ffe7570098100b25df2a9393b8e78020885f082 100644 (file)
--- a/server/middlewares/cache.ts
+++ b/server/middlewares/cache.ts
@@ -1,6 +1,6 @@
 import * as express from 'express'
 import * as AsyncLock from 'async-lock'
-import { parseDuration } from '../helpers/utils'
+import { parseDuration } from '../helpers/core-utils'
 import { Redis } from '../lib/redis'
 import { logger } from '../helpers/logger'
 
@@ -8,7 +8,7 @@ const lock = new AsyncLock({ timeout: 5000 })
 
 function cacheRoute (lifetimeArg: string | number) {
   return async function (req: express.Request, res: express.Response, next: express.NextFunction) {
-    const redisKey = Redis.Instance.buildCachedRouteKey(req)
+    const redisKey = Redis.Instance.generateCachedRouteKey(req)
 
     try {
       await lock.acquire(redisKey, async (done) => {
@@ -19,6 +19,7 @@ function cacheRoute (lifetimeArg: string | number) {
           logger.debug('No cached results for route %s.', req.originalUrl)
 
           const sendSave = res.send.bind(res)
+          const redirectSave = res.redirect.bind(res)
 
           res.send = (body) => {
             if (res.statusCode >= 200 && res.statusCode < 400) {
@@ -31,11 +32,19 @@ function cacheRoute (lifetimeArg: string | number) {
                      logger.error('Cannot cache route.', { err })
                      return done(err)
                    })
+            } else {
+              done()
             }
 
             return sendSave(body)
           }
 
+          res.redirect = url => {
+            done()
+
+            return redirectSave(url)
+          }
+
           return next()
         }
 
@@ -52,7 +61,7 @@ function cacheRoute (lifetimeArg: string | number) {
         return done()
       })
     } catch (err) {
-      logger.error('Cannot serve cached route.', err)
+      logger.error('Cannot serve cached route.', { err })
       return next()
     }
   }