droonga/droonga-http-server at d62070a [master] Inherit configs for droonga-engine (Groonga-commit) - Groonga - fulltext search engine.

YUKI Hiroshi	2014-08-29 16:12:04 +0900 (Fri, 29 Aug 2014)

  New Revision: d62070a7615b8bdeb26cbe0faf585ecb97713e57
  https://github.com/droonga/droonga-http-server/commit/d62070a7615b8bdeb26cbe0faf585ecb97713e57

  Message:
    Inherit configs for droonga-engine

  Modified files:
    lib/default-configs.js

  Modified: lib/default-configs.js (+34 -20)
===================================================================

--- lib/default-configs.js    2014-08-29 16:03:51 +0900 (9226b4c)
+++ lib/default-configs.js    2014-08-29 16:12:04 +0900 (edfc019)
@@ -3,21 +3,24 @@ var droonga = require('express-droonga'),
     yaml    = require('js-yaml'),
     path    = require('path');
 
-var configs = {};
-
 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;
-    configs.pid_file = 'droonga-http-server.pid';
-  }
+  if (!('daemon' in configs))
+    configs.daemon = true;
 }
 
-function define(path, value) {
-  var slot = configs;
+var engineConfigFile = path.resolve(baseDir, "droonga-engine.yaml");
+if (fs.existsSync(engineConfigFile)) {
+  engineConfigs = yaml.safeLoad(fs.readFileSync(engineConfigFile, 'utf8'));
+}
+
+function define(slot, path, value) {
   var keys = path.split('.');
   keys.some(function(key, index) {
     if (index == keys.length - 1) {
@@ -31,23 +34,34 @@ function define(path, value) {
   });
 }
 
-define('port',               10041);
-define('access_log_file',    '-');
-define('system_log_file',    '-');
-define('cache_size',         100);
-define('enable_trust_proxy', false);
-define('plugins', [
+define(engineConfigs, 'host', '127.0.0.1);
+define(engineConfigs, 'port', 10031);
+define(engineConfigs, 'tag',  'droonga');
+
+define(configs, 'port',               10041);
+define(configs, 'cache_size',         100);
+define(configs, 'enable_trust_proxy', false);
+define(configs, 'plugins', [
   droonga.API_REST,
   droonga.API_GROONGA,
   droonga.API_DROONGA
 ]);
-define('environment', process.env.NODE_ENV || 'development');
+define(configs, 'environment', process.env.NODE_ENV || 'development');
+
+if (configs.daemon) {
+  define(configs, 'pid_file',        'droonga-http-server.pid');
+  define(configs, 'access_log_file', 'droonga-http-server.access.log');
+  define(configs, 'system_log_file', 'droonga-http-server.system.log');
+} else {
+  define(configs, 'access_log_file',    '-');
+  define(configs, 'system_log_file',    '-');
+}
 
-define('engine.host',            '127.0.0.1');
-define('engine.port',            10031);
-define('engine.tag',             'droonga');
-define('engine.default_dataset', 'Default');
-define('engine.receiver_host',   '127.0.0.1');
+define(configs, 'engine.host',            engineConfigs.host);
+define(configs, 'engine.port',            engineConfigs.port);
+define(configs, 'engine.tag',             engineConfigs.tag);
+define(configs, 'engine.default_dataset', 'Default');
+define(configs, 'engine.receiver_host',   '127.0.0.1');
 
 configs.baseDir = baseDir;
 
-------------- next part --------------
HTML����������������������������...
Download 


Groonga - fulltext search engine.

[Groonga-commit] droonga/droonga-http-server at d62070a [master] Inherit configs for droonga-engine