Merge pull request #67 from runk/fix-fs-rename-across-devices

Fix tmp files mv across physical devices
runk · Mar 26, 2018 · c59868f · c59868f
2 parents f4ab221 + cfaec14
commit c59868f
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 16 deletions.
diff --git a/lib/cache.js b/lib/cache.js
@@ -3,7 +3,8 @@ var path = require('path'),
   fs = require('fs'),
   os = require('os'),
   crypto = require('crypto'),
-  mkdirp = require('mkdirp');
+  mkdirp = require('mkdirp'),
+  mv = require('mv');
 
 function Cache(opts) {
   this.opts = opts || {};
@@ -85,9 +86,10 @@ function Cache(opts) {
 
       // Release the lock, move data file to final destination.
       delete (locks[key]);
-      fs.renameSync(tmpPath, pathInfo.full);
-
-      self.meta(key, cb);
+      mv(tmpPath, pathInfo.full, function(err) {
+        if (err) { return cb(err); }
+        self.meta(key, cb);
+      });
     });
   };
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -8,6 +8,7 @@
     "commander": "^2.15.1",
     "log4js": "^0.6.26",
     "mkdirp": "^0.5.1",
+    "mv": "^2.1.1",
     "request": "^2.81.0"
   },
   "description": "HTTP/HTTPS caching proxy for work with `npm` utility / registry",