YUKI Hiroshi
null+****@clear*****
Thu Sep 18 17:13:35 JST 2014
YUKI Hiroshi 2014-09-18 17:13:35 +0900 (Thu, 18 Sep 2014) New Revision: 8c68345a8d32806734a7b914d8f6cc618ad356db https://github.com/droonga/droonga-http-server/commit/8c68345a8d32806734a7b914d8f6cc618ad356db Message: Allow to override base directory Modified files: lib/default-configs.js Modified: lib/default-configs.js (+22 -12) =================================================================== --- lib/default-configs.js 2014-09-18 17:02:50 +0900 (6737901) +++ lib/default-configs.js 2014-09-18 17:13:35 +0900 (17d2206) @@ -5,19 +5,27 @@ var droonga = require('express-droonga'), var baseDir = path.resolve(process.env.DROONGA_BASE_DIR || "."); -var configs = {}; var engineConfigs = {}; -var configFile = path.resolve(baseDir, "droonga-http-server.yaml"); -if (fs.existsSync(configFile)) { - configs = yaml.safeLoad(fs.readFileSync(configFile, 'utf8')); - if (!('daemon' in configs)) - configs.daemon = true; -} +function setBaseDir(baseDir) { + var configs = {}; + + var configFile = path.resolve(baseDir, "droonga-http-server.yaml"); + if (fs.existsSync(configFile)) { + configs = yaml.safeLoad(fs.readFileSync(configFile, 'utf8')); + if (!('daemon' in configs)) + configs.daemon = true; + } -var engineConfigFile = path.resolve(baseDir, "droonga-engine.yaml"); -if (fs.existsSync(engineConfigFile)) { - engineConfigs = yaml.safeLoad(fs.readFileSync(engineConfigFile, 'utf8')); + var engineConfigFile = path.resolve(baseDir, "droonga-engine.yaml"); + if (fs.existsSync(engineConfigFile)) { + engineConfigs = yaml.safeLoad(fs.readFileSync(engineConfigFile, 'utf8')); + } + + configs.baseDir = baseDir; + configs = defineDefaultConfigs(configs); + configs.setBaseDir = setBaseDir; + return configs; } function define(slot, path, value) { @@ -34,6 +42,7 @@ function define(slot, path, value) { }); } +function defineDefaultConfigs(configs) { define(engineConfigs, 'host', '127.0.0.1'); define(engineConfigs, 'port', 10031); define(engineConfigs, 'tag', 'droonga'); @@ -68,6 +77,7 @@ define(configs, 'engine.default_dataset', 'Default'); // the host name. define(configs, 'engine.receiver_host', engineConfigs.host); -configs.baseDir = baseDir; +return configs; +} -module.exports = configs; +module.exports = setBaseDir(baseDir); -------------- next part -------------- HTML����������������������������...下载
