From b5f5fd9a21e49ad2338298bec0cc18b079ff0cfe Mon Sep 17 00:00:00 2001 From: tigerbot Date: Mon, 26 Jun 2017 13:22:57 -0600 Subject: [PATCH] create the config dir in the install process --- boot/master.js | 9 ++------- install.sh | 2 +- lib/apis.js | 2 +- package.json | 2 +- 4 files changed, 5 insertions(+), 10 deletions(-) diff --git a/boot/master.js b/boot/master.js index f96e7de..e25c6dd 100644 --- a/boot/master.js +++ b/boot/master.js @@ -82,13 +82,8 @@ cluster.on('online', function (worker) { cluster.on('exit', function (worker, code, signal) { console.info('[MASTER] Worker ' + worker.process.pid + ' died with code: ' + code + ', and signal: ' + signal); - workers = workers.map(function (w) { - if (worker !== w) { - return w; - } - return null; - }).filter(function (w) { - return w; + workers = workers.filter(function (w) { + return w && w !== worker; }); //console.log('WARNING: worker spawning turned off for debugging '); diff --git a/install.sh b/install.sh index ed7b463..9fbd550 100755 --- a/install.sh +++ b/install.sh @@ -244,7 +244,7 @@ install_my_app() #git clone git@git.daplie.com:Daplie/walnut.js.git #git clone https://git.daplie.com/Daplie/walnut.js.git /srv/walnut/core - mkdir -p /srv/walnut/{core,lib,var,etc,node_modules} + mkdir -p /srv/walnut/{core,lib,var,etc,config,node_modules} rm -rf /srv/walnut/core/node_modules ln -sf ../node_modules /srv/walnut/core/node_modules mkdir -p /srv/walnut/var/sites diff --git a/lib/apis.js b/lib/apis.js index 69690f7..7cde039 100644 --- a/lib/apis.js +++ b/lib/apis.js @@ -340,7 +340,7 @@ module.exports.create = function (xconfx, apiFactories, apiDeps) { enumerable: true , configurable: false , writable: false - , value: function getSiteMailerProp(section) { + , value: function getSiteConfigProp(section) { return PromiseA.resolve((siteConfig || {})[section]); } }); diff --git a/package.json b/package.json index 331e4f4..57b8860 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "cluster-store": "git+https://git.daplie.com/Daplie/cluster-store.git#v2", "connect": "3.x", "connect-cors": "0.5.x", - "connect-recase": "1.x", + "connect-recase": "^1.0.2", "connect-send-error": "1.x", "escape-html": "^1.0.2", "escape-string-regexp": "1.x",