Navigation Menu

Skip to content

Commit

Permalink
Don't execute Loop#run from Dumper.
Browse files Browse the repository at this point in the history
It's controlled by the command line tool itself.
  • Loading branch information
piroor committed Apr 10, 2015
1 parent 6d8b244 commit 104104c
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 9 deletions.
3 changes: 2 additions & 1 deletion lib/drndump/command.rb
Expand Up @@ -111,7 +111,8 @@ def dump
:tag => @tag,
:receiver_host => @receiver_host,
:receiver_port => @receiver_port)
@dumper.run
@loop.run
@dumper.error_message
end
end
end
17 changes: 9 additions & 8 deletions lib/drndump/dumper.rb
Expand Up @@ -24,6 +24,8 @@

module Drndump
class Dumper
attr_reader :error_message

def initialize(loop, params)
@loop = loop

Expand All @@ -34,12 +36,15 @@ def initialize(loop, params)

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

prepare
end

def run
private
def prepare
client = Droonga::Client.new(client_options)

error_message = nil
@error_message = nil
n_dumpers = 0

dump_message = {
Expand All @@ -50,14 +55,14 @@ def run
case message
when Droonga::Client::Error
client.close
error_message = message.to_s
@error_message = message.to_s
else
case message["type"]
when "dump.result", "dump.error"
if message["statusCode"] != 200
client.close
error = message["body"]
error_message = "#{error['name']}: #{error['message']}"
@error_message = "#{error['name']}: #{error['message']}"
end
when "dump.table"
table_create_message = convert_to_table_create_message(message)
Expand All @@ -78,12 +83,8 @@ def run
end
end
end
@loop.run

error_message
end

private
def client_options
{
:host => @host,
Expand Down

0 comments on commit 104104c

Please sign in to comment.