cloudcms-server 0.9.268 → 0.9.272

package/launchpad/launchers/cluster.js

@@ -3,11 +3,6 @@ const { Server } = require("socket.io");
 const { setupMaster, setupWorker } = require("@socket.io/sticky");
 const { createAdapter, setupPrimary } = require("@socket.io/cluster-adapter");
 
-var numCPUs = require("os").cpus().length;
-if (process.env.FORCE_SINGLE_CPU) {
-    numCPUs = 1;
-}
-
 module.exports = function(config) {
     
     var r = {};
@@ -34,7 +29,12 @@ module.exports = function(config) {
     r.afterStartCluster = function(httpServer, callback)
     {
         var startupCount = 0;
-        
+    
+        var numCPUs = require("os").cpus().length;
+        if (process.env.FORCE_SINGLE_CPU) {
+            numCPUs = 1;
+        }
+    
         var workers = [];
         for (let i = 0; i < numCPUs; i++)
         {

package/launchpad/launchers/redis.js

@@ -32,10 +32,10 @@ module.exports = function(config) {
         httpServer.io = io;
 
         io.engine.on("connection_error", function(err) {
-            console.log("CONNECTION ERROR");
+            // console.log("CONNECTION ERROR");
             // console.log("REQUEST: ", err.req);      // the request object
             // console.log("CODE: " + err.code);     // the error code, for example 1
-            console.log("MESSAGE: ", err.message);  // the error message, for example "Session ID unknown"
+            // console.log("MESSAGE: ", err.message);  // the error message, for example "Session ID unknown"
             // console.log("CONTEXT: ", err.context);  // some additional error context
         });
 
@@ -49,7 +49,7 @@ module.exports = function(config) {
 
         // on connect
         io.on("connection", (socket) => {
-            console.log("Redis Launcher on('connection') - socket id:" + socket.id);
+            //console.log("Redis Launcher on('connection') - socket id:" + socket.id);
             socket.on('message', function(m) {
                 console.log("Socket Connection message: " + m);
             });

package/middleware/proxy/proxy.js

@@ -82,20 +82,17 @@ exports = module.exports = function()
         contentStore.existsFile(filePath, function(exists) {
 
             if (!exists) {
-                callback();
-                return;
+                return callback();
             }
 
             contentStore.fileStats(filePath, function(err, stats) {
 
                 if (err) {
-                    callback();
-                    return;
+                    return callback();
                 }
 
-                if (stats.size == 0) {
-                    callback();
-                    return;
+                if (stats.size === 0) {
+                    return callback();
                 }
 
                 var handleGoodStream = function()
@@ -117,8 +114,7 @@ exports = module.exports = function()
                 // check cacheInfo for expireTime
                 contentStore.readFile(filePath + ".cache", function(err, cacheInfoText) {
 
-                    if (err || !cacheInfoText)
-                    {
+                    if (err || !cacheInfoText) {
                         return handleBadStream();
                     }
 

package/package.json

@@ -6,7 +6,7 @@
   },
   "name": "cloudcms-server",
   "description": "Cloud CMS Application Server Module",
-  "version": "0.9.268",
+  "version": "0.9.272",
   "repository": {
     "type": "git",
     "url": "git://github.com/gitana/cloudcms-server.git"
@@ -44,7 +44,7 @@
     "handlebars": "^4.4.2",
     "hbs": "^4.0.5",
     "helmet": "^4.6.0",
-    "http-proxy": "^1.18.1",
+    "http-proxy": "file:./temp/http-proxy",
     "install": "^0.13.0",
     "ioredis": "4.28.5",
     "json5": "^1.0.1",
@@ -93,7 +93,10 @@
     "uuid": "^3.3.2",
     "vm2": "^3.8.4",
     "watch": "^0.13.0",
-    "winston": "^3.3.3"
+    "winston": "^3.3.3",
+    "eventemitter3": "^4.0.0",
+    "requires-port": "^1.0.0",
+    "follow-redirects": "^1.0.0"
   },
   "contributors": [
     {

package/temp/http-proxy/.auto-changelog

@@ -0,0 +1,6 @@
+{
+  "output": "CHANGELOG.md",
+  "template": "keepachangelog",
+  "unreleased": true,
+  "commitLimit": false
+}

package/temp/http-proxy/.gitattributes

@@ -0,0 +1 @@
+package-lock.json binary