Navigation Menu

Skip to content

Commit

Permalink
Introduce --default-dataset option to fixup missing dataset
Browse files Browse the repository at this point in the history
  • Loading branch information
piroor committed Apr 15, 2015
1 parent 8078398 commit da6144f
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 0 deletions.
7 changes: 7 additions & 0 deletions bin/droonga-request
Expand Up @@ -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,
Expand Down Expand Up @@ -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|
Expand All @@ -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
Expand Down
7 changes: 7 additions & 0 deletions bin/droonga-send
Expand Up @@ -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

Expand Down Expand Up @@ -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|
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit da6144f

Please sign in to comment.