cloudcms-server 0.9.261 → 0.9.264

package/temp/clusterlock/index.js

@@ -5,7 +5,7 @@
 var path = require("path");
 var cluster = require("cluster");
 
-var ReadWriteLock = require("rwlock");
+var AsyncLock = require('async-lock');
 
 var releaseFunctions = {};
 
@@ -18,7 +18,7 @@ var _setup = function() {
 
     if (cluster.isMaster)
     {
-        var lock = new ReadWriteLock();
+        var lock = new AsyncLock();
 
         var _claim = function(message)
         {
@@ -26,7 +26,7 @@ var _setup = function() {
 
             var ticket = "ticket-" + message.id;
 
-            lock.writeLock(key, function(releaseFn) {
+            lock.acquire(key, function(releaseFn) {
 
                 releaseFunctions[ticket] = releaseFn;
 
@@ -158,7 +158,6 @@ process.on('message', _workerIncomingMessagesHandler);
 
 var _lock = function(key, fn) {
 
-    console.log("z1: " + key);
     // notify master that we have something waiting to run for this lock
     _sendMessageToMaster({
         "type": "claim",
@@ -166,7 +165,6 @@ var _lock = function(key, fn) {
             "key": key
         },
         "callback": function(ticket) {
-            console.log("z2: " + ticket);
 
             fn.call(null, function(afterReleaseCallback) {
 

package/temp/clusterlock/package.json

@@ -13,7 +13,7 @@
     "shared"
   ],
   "devDependencies": {
-    "rwlock": "^5.0.0"
+    "async-lock": "^1.3.2"
   },
   "maintainers": [
     {

package/util/cloudcms.js

@@ -68,26 +68,23 @@ exports = module.exports = function()
     {
         if (!repositoryId)
         {
-            callback({
+            return callback({
                 "message": "Missing repositoryId in ensureContentDirectory()"
             });
-            return;
         }
 
         if (!branchId)
         {
-            callback({
+            return callback({
                 "message": "Missing branchId in ensureContentDirectory()"
             });
-            return;
         }
 
         if (!locale)
         {
-            callback({
+            return callback({
                 "message": "Missing locale in ensureContentDirectory()"
             });
-            return;
         }
 
         var contentDirectoryPath = path.join(repositoryId, branchId, nodeId, locale);
@@ -148,21 +145,17 @@ exports = module.exports = function()
             if (err)
             {
                 // nothing found
-                callback({
+                return callback({
                     "message": "Nothing cached on disk"
                 });
-
-                return;
             }
 
             if (!cacheInfoString)
             {
                 // nothing found
-                callback({
+                return callback({
                     "message": "Nothing cached on disk"
                 });
-
-                return;
             }
 
             var invalidate = function () {
@@ -346,25 +339,40 @@ exports = module.exports = function()
         {
             if (attemptCount === maxAttemptsAllowed)
             {
-                cb({
+                return cb({
                     "message": "Maximum number of connection attempts exceeded(" + maxAttemptsAllowed + ")",
                     "err": previousError
                 });
-
-                return;
             }
-
-            contentStore.writeStream(filePath, function(err, tempStream) {
-
-                if (err)
+            
+            var failFast = function(contentStore, filePath, cb) {
+                var triggered = false;
+                
+                return function(tempStream, err)
                 {
+                    // don't allow this to be called twice
+                    if (triggered) {
+                        return;
+                    }
+    
+                    triggered = true;
+                    
                     // ensure stream is closed
-                    closeWriteStream(tempStream);
-
+                    if (tempStream) {
+                        closeWriteStream(tempStream);
+                    }
+    
                     // ensure cleanup
                     return safeRemove(contentStore, filePath, function () {
                         cb(err);
                     });
+                };
+            }(contentStore, filePath, cb);
+            
+            contentStore.writeStream(filePath, function(err, tempStream) {
+
+                if (err) {
+                    return failFast(tempStream, err);
                 }
 
                 var cacheFilePath = toCacheFilePath(filePath);
@@ -398,18 +406,10 @@ exports = module.exports = function()
                     {
                         response.pipe(tempStream).on("close", function (err) {
 
-                            // TODO: not needed here?
-                            // ensure stream is closed
-                            // closeWriteStream(tempStream);
-
                             if (err)
                             {
                                 // some went wrong at disk io level?
-                                return safeRemove(contentStore, filePath, function () {
-                                    cb({
-                                        "message": "Failed to download: " + JSON.stringify(err)
-                                    });
-                                });
+                                return failFast(tempStream, err);
                             }
 
                             contentStore.existsFile(filePath, function (exists) {
@@ -418,55 +418,39 @@ exports = module.exports = function()
 
                                     // write cache file
                                     var cacheInfo = buildCacheInfo(response);
-                                    if (cacheInfo)
-                                    {
-                                        contentStore.writeFile(cacheFilePath, JSON.stringify(cacheInfo, null, "    "), function (err) {
-
-                                            if (err)
-                                            {
-                                                // failed to write cache file, thus the whole thing is invalid
-                                                safeRemove(contentStore, cacheFilePath, function () {
-                                                    safeRemove(contentStore, filePath, function () {
-                                                        cb({
-                                                            "message": "Failed to write cache file: " + cacheFilePath
-                                                        });
-                                                    });
+                                    if (!cacheInfo) {
+                                        return cb(null, filePath, null);
+                                    }
+                                    
+                                    contentStore.writeFile(cacheFilePath, JSON.stringify(cacheInfo, null, "    "), function (err) {
+
+                                        if (err)
+                                        {
+                                            // failed to write cache file, thus the whole thing is invalid
+                                            return safeRemove(contentStore, cacheFilePath, function () {
+                                                failFast(tempStream, {
+                                                    "message": "Failed to write cache file: " + cacheFilePath + ", err: " + JSON.stringify(err)
                                                 });
-                                            }
-                                            else
-                                            {
-                                                cb(null, filePath, cacheInfo);
-                                            }
+                                            });
+                                        }
 
-                                        });
-                                    }
-                                    else
-                                    {
                                         cb(null, filePath, cacheInfo);
-                                    }
+                                    });
                                 }
                                 else
                                 {
-                                    //process.log("WARN: exists false, " + filePath);
-
                                     // for some reason, file wasn't found
                                     // roll back the whole thing
                                     safeRemove(contentStore, cacheFilePath, function () {
-                                        safeRemove(contentStore, filePath, function () {
-                                            cb({
-                                                "message": "Failed to verify written cached file: " + filePath
-                                            });
+                                        failFast(tempStream, {
+                                            "message": "Failed to verify written cached file: " + filePath
                                         });
                                     });
                                 }
                             });
 
                         }).on("error", function (err) {
-
-                            // ensure stream is closed
-                            closeWriteStream(tempStream);
-
-                            process.log("Pipe error: " + err);
+                            failFast(tempStream, err);
                         });
                     }
                     else
@@ -480,10 +464,7 @@ exports = module.exports = function()
                         });
 
                         response.on('end', function () {
-
-                            // ensure stream is closed
-                            closeWriteStream(tempStream);
-
+                            
                             var afterCleanup = function () {
 
                                 // see if it is "invalid_token"
@@ -518,9 +499,11 @@ exports = module.exports = function()
                                     "code": response.statusCode,
                                     "body": body
                                 });
-
                             };
-
+    
+                            // ensure stream is closed
+                            closeWriteStream(tempStream);
+    
                             // clean things up
                             safeRemove(contentStore, cacheFilePath, function () {
                                 safeRemove(contentStore, filePath, function () {
@@ -532,12 +515,8 @@ exports = module.exports = function()
                     }
 
                 }).on('error', function (e) {
-
-                    // ensure stream is closed
-                    closeWriteStream(tempStream);
-
-                    //process.log("_writeToDisk request timed out");
-                    //process.log(e)
+                    failFast(tempStream, e);
+    
                 }).on('end', function (e) {
 
                     // ensure stream is closed
@@ -548,9 +527,11 @@ exports = module.exports = function()
                 tempStream.on("error", function (e) {
                     process.log("Temp stream errored out");
                     process.log(e);
+    
+                    failFast(tempStream, e);
 
                     // ensure stream is closed
-                    closeWriteStream(tempStream);
+                    //closeWriteStream(tempStream);
 
                 });
             });
@@ -608,8 +589,7 @@ exports = module.exports = function()
                 readFromDisk(contentStore, filePath, function (err, cacheInfo) {
 
                     if (!err && cacheInfo) {
-                        callback(err, filePath, cacheInfo);
-                        return;
+                        return callback(err, filePath, cacheInfo);
                     }
 
                     // either there was an error (in which case things were cleaned up)
@@ -631,13 +611,12 @@ exports = module.exports = function()
 
                         if (err) {
                             process.log("writeToDisk error, err: " + err.message + ", body: " + err.body);
-                            callback(err);
-                        }
-                        else {
-                            //process.log("Fetched: " + assetPath);
-                            //process.log("Retrieved from server: " + filePath);
-                            callback(null, filePath, cacheInfo);
+                            return callback(err);
                         }
+
+                        //process.log("Fetched: " + assetPath);
+                        //process.log("Retrieved from server: " + filePath);
+                        callback(null, filePath, cacheInfo);
                     });
                 });
             };
@@ -749,6 +728,7 @@ exports = module.exports = function()
                     writeToDisk(contentStore, gitana, uri, filePath, function (err, filePath, responseHeaders) {
 
                         if (err) {
+                            
                             if (err.code === 404) {
                                 return callback();
                             }
@@ -1101,7 +1081,6 @@ exports = module.exports = function()
         _LOCK(contentStore, _lock_identifier(repositoryId, branchId, nodeId), function(err, releaseLockFn) {
 
             invalidateNode(contentStore, repositoryId, branchId, nodeId, function () {
-
                 invalidateNodePaths(contentStore, repositoryId, branchId, paths, function() {
 
                     // release lock