From e49fd37eac538ff6af07c2af9733145ec830d5dc Mon Sep 17 00:00:00 2001 From: Unitech Date: Sun, 16 Nov 2014 14:09:14 +0100 Subject: [PATCH] sample-conf --- constants.js | 3 +-- lib/samples/sample-conf.js | 3 +++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/constants.js b/constants.js index 930c52b8..ec5da7ed 100644 --- a/constants.js +++ b/constants.js @@ -84,13 +84,12 @@ var default_conf = { /** * Extend with optional configuration file */ - if (fs.existsSync(csts.PM2_CONF_FILE)) { try { var extra = require(csts.PM2_CONF_FILE)(PM2_ROOT_PATH); default_conf = util._extend(default_conf, extra); } catch(e) { - console.error(e.stack || e); + //console.error(e.stack || e); } } diff --git a/lib/samples/sample-conf.js b/lib/samples/sample-conf.js index 045656a7..6d57e476 100644 --- a/lib/samples/sample-conf.js +++ b/lib/samples/sample-conf.js @@ -6,6 +6,9 @@ var p = require('path'); module.exports = function(DEFAULT_HOME) { + if (!DEFAULT_HOME) + return false; + var PM2_HOME = DEFAULT_HOME; var pm2_conf = {