From 11b0bc55a20319e8103cb25e0953772fa080676c Mon Sep 17 00:00:00 2001 From: YUKI Hiroshi Date: Mon, 20 Apr 2015 15:07:46 +0900 Subject: [PATCH] Accept "--default-timeout" option for connections with engines --- lib/default-configs.js | 1 + lib/option-utils.js | 5 +++++ lib/server-options.js | 4 ++++ 3 files changed, 10 insertions(+) diff --git a/lib/default-configs.js b/lib/default-configs.js index 8d6a047..0ebcb24 100644 --- a/lib/default-configs.js +++ b/lib/default-configs.js @@ -91,6 +91,7 @@ function defineDefaultConfigs(configs) { // node and it is guaranteed that this computer can be accessed with // the host name. define(configs, 'engine.receive_host', engineConfigs.host); + define(configs, 'engine.default_timeout', engineConfigs.default_timeout); return configs; } diff --git a/lib/option-utils.js b/lib/option-utils.js index 0f06d73..b5bdcc2 100644 --- a/lib/option-utils.js +++ b/lib/option-utils.js @@ -21,6 +21,11 @@ function intOption(newValue, oldValue) { } exports.intOption = intOption; +function floatOption(newValue, oldValue) { + return parseFloat(newValue); +} +exports.floatOption = floatOption; + function stringsOption(newValue, oldValue) { return normalizeStringArray(newValue); } diff --git a/lib/server-options.js b/lib/server-options.js index 9fab471..7a2683a 100644 --- a/lib/server-options.js +++ b/lib/server-options.js @@ -23,6 +23,7 @@ options.droongaEnginePort = defaultConfigs.engine.port; options.tag = defaultConfigs.engine.tag; options.defaultDataset = defaultConfigs.engine.default_dataset; options.receiveHostName = defaultConfigs.engine.receive_host; +options.defaultTimeout = defaultConfigs.engine.default_timeout; function generateOptionHandler(onHandle, converter) { return function(newValue, oldValue) { @@ -67,6 +68,9 @@ function define() { 'The default dataset (' + options.defaultDataset + ')'); add('--tag ', 'The tag (' + options.tag + ')'); + add('--default-timeout ', + 'Time to terminate unresponsive connections (in seconds) (' + options.defaultTimeout + ')', + optionUtils.floatOption); add('--access-log-file ', 'Output access logs to . ' + 'You can use "-" as to output to the standard output. ' +