YUKI Hiroshi
null+****@clear*****
Wed Apr 15 15:49:39 JST 2015
YUKI Hiroshi 2015-04-15 15:49:39 +0900 (Wed, 15 Apr 2015) New Revision: da6144f05a681f100649ab6d093bcd9aa43e4886 https://github.com/droonga/droonga-client-ruby/commit/da6144f05a681f100649ab6d093bcd9aa43e4886 Message: Introduce --default-dataset option to fixup missing dataset Modified files: bin/droonga-request bin/droonga-send Modified: bin/droonga-request (+7 -0) =================================================================== --- bin/droonga-request 2015-04-15 15:45:06 +0900 (2d5ca70) +++ bin/droonga-request 2015-04-15 15:49:39 +0900 (b5a0289) @@ -25,6 +25,7 @@ options = { :host => Droonga::Client::DEFAULT_HOST, :port => Droonga::Client::DEFAULT_PORT, :tag => Droonga::Client::DEFAULT_TAG, + :default_dataset => Droonga::Client::DEFAULT_DATASET, :protocol => :droonga, :timeout => 1, :exit_on_response => true, @@ -101,6 +102,11 @@ parser.on("--[no-]report-elapsed-time", end parser.separator("") parser.separator("Messages:") +parser.on("--detault-dataset=NAME", + "Default dataset name for sending messages.", + "(#{options[:default_dataset]})") do |name| + options[:default_dataset] = name +end parser.on("--[no-]completion", "Do completion of required fields for input message or not.", "(#{options[:completion]})") do |completion| @@ -116,6 +122,7 @@ request_json_files = parser.parse!(ARGV) client = Droonga::Client.new(options) json_parser = Yajl::Parser.new json_parser.on_parse_complete = lambda do |request_message| + request_message["dataset"] ||= options[:default_dataset] if options[:report_request] message = "Request: " begin Modified: bin/droonga-send (+7 -0) =================================================================== --- bin/droonga-send 2015-04-15 15:45:06 +0900 (bbac29c) +++ bin/droonga-send 2015-04-15 15:49:39 +0900 (9a6b9e1) @@ -29,6 +29,7 @@ options.default_protocol = "droonga" options.default_host = Droonga::Client::DEFAULT_HOST options.default_port = Droonga::Client::DEFAULT_PORT options.default_tag = Droonga::Client::DEFAULT_TAG +options.default_dataset = Droonga::Client::DEFAULT_DATASET options.completion = true options.validation = true @@ -145,6 +146,11 @@ parser.on("--report-throughput", end parser.separator("") parser.separator("Messages:") +parser.on("--default-dataset=NAME", + "Default dataset name for sending messages.", + "(#{options.default_dataset})") do |name| + options.default_dataset = name +end parser.on("--[no-]completion", "Do completion of required fields for input message or not.", "(#{options.completion})") do |completion| @@ -174,6 +180,7 @@ end client_index = 0 json_parser = Yajl::Parser.new json_parser.on_parse_complete = lambda do |request_message| + request_message["dataset"] ||= options.default_dataset if options.report_request message = "Request: " begin -------------- next part -------------- HTML����������������������������...Download
