fix: should alway remove tmp files on try finally (eggjs#89)

barntet · Nov 11, 2018 · b17d146 · b17d146
1 parent 68a2402
commit b17d146
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 17 deletions.
diff --git a/multipart-file-mode/app/controller/ajax.js b/multipart-file-mode/app/controller/ajax.js
@@ -19,10 +19,14 @@ module.exports = class extends Controller {
     const targetPath = path.join(this.config.baseDir, 'app/public', filename);
     const source = fs.createReadStream(file.filepath);
     const target = fs.createWriteStream(targetPath);
-    await pump(source, target);
-    ctx.logger.warn('save %s to %s', file.filepath, targetPath);
-    // delete tmp file
-    await fs.unlink(file.filepath);
+
+    try {
+      await pump(source, target);
+      ctx.logger.warn('save %s to %s', file.filepath, targetPath);
+    } finally {
+      // delete those request tmp files
+      await ctx.cleanupRequestFiles();
+    }
 
     ctx.body = { url: '/public/' + filename };
   }

diff --git a/multipart-file-mode/app/controller/form.js b/multipart-file-mode/app/controller/form.js
@@ -19,10 +19,14 @@ module.exports = class extends Controller {
     const targetPath = path.join(this.config.baseDir, 'app/public', filename);
     const source = fs.createReadStream(file.filepath);
     const target = fs.createWriteStream(targetPath);
-    await pump(source, target);
-    ctx.logger.warn('save %s to %s', file.filepath, targetPath);
-    // delete tmp file
-    await fs.unlink(file.filepath);
+
+    try {
+      await pump(source, target);
+      ctx.logger.warn('save %s to %s', file.filepath, targetPath);
+    } finally {
+      // delete those request tmp files
+      await ctx.cleanupRequestFiles();
+    }
 
     ctx.redirect('/public/' + filename);
   }

diff --git a/multipart-file-mode/app/controller/multiple.js b/multipart-file-mode/app/controller/multiple.js
@@ -14,15 +14,19 @@ module.exports = class extends Controller {
     const { ctx } = this;
     const files = ctx.request.files;
     ctx.logger.warn('files: %j', files);
-    for (const file of files) {
-      const filename = file.filename.toLowerCase();
-      const targetPath = path.join(this.config.baseDir, 'app/public', filename);
-      const source = fs.createReadStream(file.filepath);
-      const target = fs.createWriteStream(targetPath);
-      await pump(source, target);
-      ctx.logger.warn('save %s to %s', file.filepath, targetPath);
-      // delete tmp file
-      await fs.unlink(file.filepath);
+
+    try {
+      for (const file of files) {
+        const filename = file.filename.toLowerCase();
+        const targetPath = path.join(this.config.baseDir, 'app/public', filename);
+        const source = fs.createReadStream(file.filepath);
+        const target = fs.createWriteStream(targetPath);
+        await pump(source, target);
+        ctx.logger.warn('save %s to %s', file.filepath, targetPath);
+      }
+    } finally {
+      // delete those request tmp files
+      await ctx.cleanupRequestFiles();
     }
 
     const fields = [];