Navigation Menu

Skip to content

Commit

Permalink
Don't output result by Dumper itself
Browse files Browse the repository at this point in the history
  • Loading branch information
piroor committed Apr 10, 2015
1 parent 393cf6b commit b203be0
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 7 deletions.
5 changes: 4 additions & 1 deletion lib/drndump/command.rb
Expand Up @@ -15,6 +15,7 @@

require "socket"
require "optparse"
require "json"

require "cool.io"

Expand Down Expand Up @@ -114,7 +115,9 @@ def dump
:backend => :coolio,
:loop => @loop,
}
@dumper.run(:client_options => client_options)
@dumper.run(:client_options => client_options) do |message|
puts(JSON.pretty_generate(message))
end
@loop.run
@dumper.error_message
end
Expand Down
12 changes: 6 additions & 6 deletions lib/drndump/dumper.rb
Expand Up @@ -14,7 +14,6 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA

require "socket"
require "json"

require "droonga/client"

Expand All @@ -30,13 +29,14 @@ def initialize(params)

@receiver_host = params[:receiver_host] || Socket.gethostname
@receiver_port = params[:receiver_port] || 0

@error_message = nil
end

def run(options={})
def run(options={}, &block)
extra_client_options = options[:client_options] || {}
client = Droonga::Client.new(client_options.merge(extra_client_options))

@error_message = nil
n_dumpers = 0

dump_message = {
Expand All @@ -58,15 +58,15 @@ def run(options={})
end
when "dump.table"
table_create_message = convert_to_table_create_message(message)
puts(JSON.pretty_generate(table_create_message))
yield(table_create_message)
when "dump.column"
column_create_message = convert_to_column_create_message(message)
puts(JSON.pretty_generate(column_create_message))
yield(column_create_message)
when "dump.record"
add_message = message.dup
add_message.delete("inReplyTo")
add_message["type"] = "add"
puts(JSON.pretty_generate(add_message))
yield(add_message)
when "dump.start"
n_dumpers += 1
when "dump.end"
Expand Down

0 comments on commit b203be0

Please sign in to comment.