YUKI Hiroshi
null+****@clear*****
Thu Sep 18 17:36:56 JST 2014
YUKI Hiroshi 2014-09-18 17:36:56 +0900 (Thu, 18 Sep 2014) New Revision: 7dcc7d609d090d0a301aade0a926ce970bd44ab8 https://github.com/droonga/droonga-http-server/commit/7dcc7d609d090d0a301aade0a926ce970bd44ab8 Message: Load droonga-engine.yaml for the service Modified files: lib/default-configs.js Modified: lib/default-configs.js (+11 -3) =================================================================== --- lib/default-configs.js 2014-09-18 17:13:35 +0900 (17d2206) +++ lib/default-configs.js 2014-09-18 17:36:56 +0900 (ae52e9d) @@ -6,6 +6,8 @@ var droonga = require('express-droonga'), var baseDir = path.resolve(process.env.DROONGA_BASE_DIR || "."); var engineConfigs = {}; +var engineServiceUserName = 'droonga-engine'; +var engineServiceBaseDir = '/home/' + engineServiceUserName + '/droonga'; function setBaseDir(baseDir) { var configs = {}; @@ -17,9 +19,15 @@ function setBaseDir(baseDir) { configs.daemon = true; } - var engineConfigFile = path.resolve(baseDir, "droonga-engine.yaml"); - if (fs.existsSync(engineConfigFile)) { - engineConfigs = yaml.safeLoad(fs.readFileSync(engineConfigFile, 'utf8')); + var engineServiceConfigFile = path.resolve(engineServiceBaseDir, "droonga-engine.yaml"); + if (fs.existsSync(engineServiceConfigFile)) { + engineConfigs = yaml.safeLoad(fs.readFileSync(engineServiceConfigFile, 'utf8')); + } + else { + var engineConfigFile = path.resolve(baseDir, "droonga-engine.yaml"); + if (fs.existsSync(engineConfigFile)) { + engineConfigs = yaml.safeLoad(fs.readFileSync(engineConfigFile, 'utf8')); + } } configs.baseDir = baseDir; -------------- next part -------------- HTML����������������������������...Download