X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fcontrollers%2Flazy-static.ts;h=9a7dacba049e86d3eb546dcc4bc91369ff591333;hb=e622db0578bd46b2fd31fc23beb5aebcea2caa65;hp=27b1b7160054fecee2c3dc73cb81e24bf9a12855;hpb=136d7efde798d3dc0ec0dd18aac674365f7d162e;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/controllers/lazy-static.ts b/server/controllers/lazy-static.ts index 27b1b7160..9a7dacba0 100644 --- a/server/controllers/lazy-static.ts +++ b/server/controllers/lazy-static.ts @@ -48,7 +48,7 @@ export { // --------------------------------------------------------------------------- -async function getActorImage (req: express.Request, res: express.Response) { +async function getActorImage (req: express.Request, res: express.Response, next: express.NextFunction) { const filename = req.params.filename if (actorImagePathUnsafeCache.has(filename)) { @@ -78,7 +78,23 @@ async function getActorImage (req: express.Request, res: express.Response) { const path = image.getPath() actorImagePathUnsafeCache.set(filename, path) - return res.sendFile(path, { maxAge: STATIC_MAX_AGE.LAZY_SERVER }) + + return res.sendFile(path, { maxAge: STATIC_MAX_AGE.LAZY_SERVER }, (err: any) => { + if (!err) return + + // It seems this actor image is not on the disk anymore + if (err.status === HttpStatusCode.NOT_FOUND_404 && !image.isOwned()) { + logger.error('Cannot lazy serve actor image %s.', filename, { err }) + + actorImagePathUnsafeCache.del(filename) + + image.onDisk = false + image.save() + .catch(err => logger.error('Cannot save new actor image disk state.', { err })) + } + + return next(err) + }) } async function getPreview (req: express.Request, res: express.Response) {