cloudcms-server 4.0.0-beta.2 → 4.0.0-beta.20

package/middleware/deployment/deployment.js

@@ -1,5 +1,4 @@
 var util = require("../../util/util");
-var duster = require("../../duster/index");
 
 /**
  * Deployment middleware.
@@ -299,10 +298,6 @@ exports = module.exports = function()
                     logFn("Invalidating application cache for application: " + descriptor.application.id);
                     process.cache.invalidateCacheForApp(descriptor.application.id);
 
-                    // invalidate "duster" cache for this application
-                    logFn("Invalidating duster cache for application: " + descriptor.application.id);
-                    duster.invalidateCacheForApp(descriptor.application.id);
-
                     // invalidate gitana driver for this application
                     process.broadcast.publish("application_invalidation", {
                         "applicationId": descriptor.application.id,
@@ -348,36 +343,39 @@ exports = module.exports = function()
                 var rootStore = stores.root;
                 rootStore.allocated(function(allocated) {
 
+                    console.log("H2: " + allocated);
                     if (!allocated) {
-                        return callback({
+                        callback({
                             "message": "The application cannot be started because it is not deployed."
                         });
                     }
+                    else
+                    {
+                        rootStore.readFile("descriptor.json", function (err, data) {
 
-                    rootStore.readFile("descriptor.json", function (err, data) {
-
-                        if (err) {
-                            return callback(err);
-                        }
+                            if (err) {
+                                return callback(err);
+                            }
 
-                        data = JSON.parse(data);
+                            data = JSON.parse(data);
 
-                        // is it already started?
-                        if (data.active) {
-                            return callback({
-                                "message": "The application is already started"
-                            });
-                        }
+                            // is it already started?
+                            if (data.active) {
+                                return callback({
+                                    "message": "The application is already started"
+                                });
+                            }
 
-                        data.active = true;
+                            data.active = true;
 
-                        logFn("Starting application: " + data.application.id + " with host: " + host);
+                            logFn("Starting application: " + data.application.id + " with host: " + host);
 
-                        rootStore.writeFile("descriptor.json", JSON.stringify(data, null, "  "), function (err) {
-                            console.log("Start error: "+ err);
-                            callback(err);
+                            rootStore.writeFile("descriptor.json", JSON.stringify(data, null, "  "), function (err) {
+                                console.log("Start error: "+ err);
+                                callback(err);
+                            });
                         });
-                    });
+                    }
                 });
             });
         });

package/middleware/driver/driver.js

@@ -3,6 +3,8 @@ var http = require('http');
 var util = require("../../util/util");
 var async = require("async");
 
+var Loaders = require("../../util/loaders");
+
 var Gitana = require("gitana");
 
 ////////////////////////////////////////////////////////////////////////////
@@ -38,6 +40,27 @@ exports = module.exports = function()
     var r = {};
 
     var doConnect = r.doConnect = function(req, gitanaConfig, callback)
+    {
+        var key = JSON.stringify(gitanaConfig);
+
+        var loader = function(req, gitanaConfig)
+        {
+            return function(cb)
+            {
+                _doConnect(req, gitanaConfig, function(err) {
+                    cb.call(this, err);
+                });
+            }
+        }(req, gitanaConfig);
+
+        var exclusiveLoader = Loaders.exclusive(loader, key, process.defaultExclusiveLockTimeoutMs);
+
+        exclusiveLoader(function(err) {
+            callback.call(this, err);
+        });
+    };
+
+    var _doConnect = function(req, gitanaConfig, callback)
     {
         // either connect anew or re-use an existing connection to Cloud CMS for this application
         Gitana.connect(gitanaConfig, function(err) {
@@ -45,7 +68,7 @@ exports = module.exports = function()
             if (err)
             {
                 // log as much as we can
-                if(process.env.NODE_ENV === "production")
+                if (process.env.NODE_ENV === "production")
                 {
                     console.warn("Error connecting driver (domainHost=" + req.domainHost + ", virtualHost: " + req.virtualHost + ", err: " + JSON.stringify(err));
                 }

package/middleware/driver-config/driver-config.js

@@ -1,10 +1,4 @@
-var path = require('path');
-var http = require('http');
-var request = require('request');
 var util = require("../../util/util");
-var Gitana = require("gitana");
-
-var fs = require("fs");
 
 /**
  * Retrieves local driver configuration for hosts from Cloud CMS.

package/middleware/modules/modules.js

@@ -55,14 +55,20 @@ exports = module.exports = function()
             });
         }
 
-        if (!moduleConfig.source)
+        var source = moduleConfig.source40;
+        if (!source)
+        {
+            source = moduleConfig.source;
+        }
+
+        if (!source)
         {
             return callback({
                 "message": "Missing module config source settings"
             });
         }
 
-        var sourceType = moduleConfig.source.type;
+        var sourceType = source.type;
         if (!sourceType)
         {
             return callback({
@@ -70,7 +76,7 @@ exports = module.exports = function()
             });
         }
 
-        var sourceUrl = moduleConfig.source.uri;
+        var sourceUrl = source.uri;
         if (!sourceUrl)
         {
             return callback({
@@ -78,12 +84,12 @@ exports = module.exports = function()
             });
         }
 
-        var sourcePath = moduleConfig.source.path;
+        var sourcePath = source.path;
         if (!sourcePath) {
             sourcePath = "/";
         }
 
-        var sourceBranch = moduleConfig.source.branch;
+        var sourceBranch = source.branch;
         if (!sourceBranch) {
             sourceBranch = "master";
         }

package/middleware/perf/perf.js

@@ -194,8 +194,9 @@ exports = module.exports = function()
                             car = filename;
                         }
                         var regex1 = new RegExp("-[0-9a-f]{32}$"); // md5
-                        var regex2 = new RegExp("-[0-9]{13}$"); // timestamp
-                        if (regex1.test(car) || regex2.test(car))
+                        var regex2 = new RegExp("-[0-9]{13}$"); // timestamp?
+                        var regex3 = new RegExp("-[0-9]{10}$"); // epoch millis
+                        if (regex1.test(car) || regex2.test(car) || regex3.test(car))
                         {
                             var x = car.lastIndexOf("-");
 

package/middleware/registration/registration.js

@@ -1,9 +1,4 @@
-var path = require('path');
-var fs = require('fs');
-var http = require('http');
 var util = require("../../util/util");
-var Gitana = require("gitana");
-var duster = require("../../duster/index");
 var async = require("async");
 var auth = require("../../util/auth");
 

package/middleware/stores/engines/empty.js

@@ -84,10 +84,6 @@ exports = module.exports = function(engineId, engineType, engineConfig)
         callback(null, null); //data
     };
 
-    r.watchDirectory = function(directoryPath, onChange)
-    {
-    };
-
     r.moveFile = function(originalFilePath, newFilePath, callback)
     {
         callback(null);

package/middleware/stores/engines/fs-caching-adapter.js

@@ -442,11 +442,6 @@ exports = module.exports = function(remoteStore, settings)
         cacheStore.readFile(filePath, callback);
     };
 
-    r.watchDirectory = function(directoryPath, onChange)
-    {
-        // NOT IMPLEMENTED
-    };
-
     r.moveFile = function(originalFilePath, newFilePath, callback)
     {
         remoteStore.moveFile(originalFilePath, newFilePath, function(err) {

package/middleware/stores/engines/fs.js

@@ -4,8 +4,6 @@ var http = require('http');
 
 var util = require("../../../util/util");
 
-var watch = require("watch");
-
 var async = require("async");
 
 /**
@@ -217,13 +215,6 @@ exports = module.exports = function(engineConfig)
         });
     };
 
-    r.watchDirectory = function(directoryPath, onChange)
-    {
-        watch.watchTree(toStoragePath(directoryPath), function(f, curr, prev) {
-            onChange(f, curr, prev);
-        });
-    };
-
     r.moveFile = function(originalFilePath, newFilePath, callback)
     {
         fs.rename(toStoragePath(originalFilePath), newFilePath, function(err) {

package/middleware/stores/engines/s3.js

@@ -406,11 +406,6 @@ exports = module.exports = function(engineConfig)
         });
     };
 
-    // NOT IMPLEMENTED IN S3
-    r.watchDirectory = function(directoryPath, onChange)
-    {
-    };
-
     r.moveFile = function(originalFilePath, newFilePath, callback)
     {
         var originalKey = _toKey(originalFilePath);

package/middleware/stores/engines/s3fs.js

@@ -79,11 +79,6 @@ exports = module.exports = function(engineConfig)
         cachingAdapter.readFile(filePath, callback);
     };
 
-    r.watchDirectory = function(directoryPath, onChange)
-    {
-        cachingAdapter.watchDirectory(directoryPath, onChange);
-    };
-
     r.moveFile = function(originalFilePath, newFilePath, callback)
     {
         cachingAdapter.moveFile(originalFilePath, newFilePath, callback);

package/middleware/stores/multistore.js

@@ -283,35 +283,6 @@ exports = module.exports = function(originalStores)
         });
     };
 
-    r.watchDirectory = function(directoryPath, onChange)
-    {
-        findFileStores(directoryPath, function(err, stores) {
-
-            if (err) {
-                return;
-            }
-
-            if (stores.length === 0) {
-                return;
-            }
-
-            var fns = [];
-            for (var i = 0; i < stores.length; i++)
-            {
-                var fn = function(s, directoryPath) {
-                    return function(done) {
-                        s.watchDirectory(directoryPath, onChange);
-                        done();
-                    }
-                }(stores[i], directoryPath);
-                fns.push(fn);
-            }
-            async.series(fns, function() {
-                // done
-            });
-        });
-    };
-
     r.moveFile = function(originalFilePath, newFilePath, callback)
     {
         // TODO: not implemented

package/middleware/stores/store.js

@@ -1,4 +1,3 @@
-var request = require('request');
 var path = require('path');
 
 var util = require("../../util/util");
@@ -239,15 +238,6 @@ exports = module.exports = function(engine, engineType, engineId, engineConfigur
         });
     };
 
-    r.watchDirectory = function(directoryPath, onChange)
-    {
-        debugStart("Start store.watchDirectory: " + _enginePath(directoryPath));
-        engine.watchDirectory(_enginePath(directoryPath), function(f, curr, prev) {
-            debugFinish("Finish store.watchDirectory");
-            onChange(f, curr, prev);
-        });
-    };
-
     r.moveFile = function(originalFilePath, newFilePath, callback)
     {
         debugStart("Start store.moveFile");

package/middleware/stores/stores.js

@@ -417,7 +417,7 @@ exports = module.exports = function()
                         var moduleStoreType = moduleDescriptors[i].store;
                         var modulePath = moduleDescriptors[i].path;
 
-                        //console.log("Config Store - Module Path: " + modulePath + ", type: " + moduleStoreType);
+                        console.log("Config Store - Module Path: " + modulePath + ", type: " + moduleStoreType);
 
                         var storePath = path.join(modulePath, "config");
                         if (moduleStoreType === "modules")
@@ -520,7 +520,7 @@ exports = module.exports = function()
                         callback();
                     });
                 };
-    
+
                 process.cache.read("module-descriptors-" + host, function(err, moduleDescriptors) {
 
                     moduleDescriptors = null;