From 79db409a41bd28fd2773626c9a93b5d326a38bc0 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 14 Jun 2021 16:14:45 +0200 Subject: More robust actor image lazy load --- server/controllers/lazy-static.ts | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) (limited to 'server/controllers/lazy-static.ts') 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) { -- cgit v1.2.3