From 4ee7a4c9ac9280cda930a281c2d5a9a4c409cc14 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Mon, 15 Apr 2019 15:04:02 +0200
Subject: [PATCH] Remove tmp file on image processing error

---
 server/helpers/requests.ts      | 9 ++++++++-
 server/lib/activitypub/actor.ts | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/server/helpers/requests.ts b/server/helpers/requests.ts
index 60c94da81..8dda6c039 100644
--- a/server/helpers/requests.ts
+++ b/server/helpers/requests.ts
@@ -50,7 +50,14 @@ async function downloadImage (url: string, destDir: string, destName: string, si
   await doRequestAndSaveToFile({ method: 'GET', uri: url }, tmpPath)
 
   const destPath = join(destDir, destName)
-  await processImage({ path: tmpPath }, destPath, size)
+
+  try {
+    await processImage({ path: tmpPath }, destPath, size)
+  } catch (err) {
+    await remove(tmpPath)
+
+    throw err
+  }
 }
 
 // ---------------------------------------------------------------------------
diff --git a/server/lib/activitypub/actor.ts b/server/lib/activitypub/actor.ts
index 0db75906c..25cd40905 100644
--- a/server/lib/activitypub/actor.ts
+++ b/server/lib/activitypub/actor.ts
@@ -270,7 +270,7 @@ async function refreshActorIfNeeded (
       return { refreshed: true, actor }
     })
   } catch (err) {
-    logger.warn('Cannot refresh actor.', { err })
+    logger.warn('Cannot refresh actor %s.', actor.url, { err })
     return { actor, refreshed: false }
   }
 }