Navigation Menu

Skip to content

Commit

Permalink
Apply default target role via MessageCompleter
Browse files Browse the repository at this point in the history
  • Loading branch information
piroor committed Apr 29, 2015
1 parent 67fd542 commit 2b86bdf
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 3 deletions.
1 change: 0 additions & 1 deletion bin/droonga-request
Expand Up @@ -129,7 +129,6 @@ 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]
request_message["targetRole"] ||= options[:default_target_role]
if options[:report_request]
message = "Request: "
begin
Expand Down
2 changes: 1 addition & 1 deletion bin/droonga-send
Expand Up @@ -62,6 +62,7 @@ def parse_server(server, options)
:port => Integer(port),
:protocol => protocol.to_sym,
:tag => tag,
:default_target_role => options.default_target_role,
:completion => options.completion,
:validation => options.validation,
}
Expand Down Expand Up @@ -187,7 +188,6 @@ client_index = 0
json_parser = Yajl::Parser.new
json_parser.on_parse_complete = lambda do |request_message|
request_message["dataset"] ||= options.default_dataset
request_message["targetRole"] ||= options.default_target_role
if options.report_request
message = "Request: "
begin
Expand Down
3 changes: 2 additions & 1 deletion lib/droonga/client.rb
Expand Up @@ -91,7 +91,8 @@ def initialize(options={})
@completion = options[:completion] != false
@validation = options[:validation] != false

@completer = MessageCompleter.new(:default_timeout => options[:default_timeout])
@completer = MessageCompleter.new(:default_timeout => options[:default_timeout],
:default_target_role => options[:default_target_role])
@validator = MessageValidator.new
end

Expand Down
4 changes: 4 additions & 0 deletions lib/droonga/client/message_completer.rb
Expand Up @@ -24,6 +24,7 @@ def initialize(options={})
@options = options
@fixed_date = @options[:fixed_date]
@default_timeout = @options[:default_timeout]
@default_target_role = @options[:default_target_role]
end

def complete(message)
Expand All @@ -32,6 +33,9 @@ def complete(message)
if not have_timeout?(message) and @default_timeout
message["timeout"] = @default_timeout
end
if not message["targetRole"].nil? and @default_target_role
message["targetRole"] = @default_target_role
end
message.merge("id" => id, "date" => date)
end

Expand Down

0 comments on commit 2b86bdf

Please sign in to comment.