Navigation Menu

Skip to content

Commit

Permalink
Simplify
Browse files Browse the repository at this point in the history
  • Loading branch information
piroor committed Apr 23, 2015
1 parent 7b2ef5f commit 2e3b979
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 49 deletions.
5 changes: 1 addition & 4 deletions lib/droonga/engine_node.rb
Expand Up @@ -274,7 +274,7 @@ def set_auto_close_timer
previous_timer.detach if previous_timer

@auto_close_timer = Coolio::TimerWatcher.new(@auto_close_timeout)
on_timeout = lambda do
@auto_close_timer.on_timer do
@auto_close_timer.detach
@auto_close_timer = nil
if @sender
Expand All @@ -283,9 +283,6 @@ def set_auto_close_timer
@sender = nil
end
end
@auto_close_timer.on_timer do
on_timeout.call
end
@loop.attach(@auto_close_timer)
end

Expand Down
25 changes: 6 additions & 19 deletions lib/droonga/fluent_message_sender.rb
Expand Up @@ -75,21 +75,6 @@ def connected?
def connect
logger.trace("connect: start")

log_write_complete = lambda do
logger.trace("write completed")
end
log_connect = lambda do
logger.trace("connected")
end
log_failed = lambda do
logger.error("failed to connect")
@socket = nil
end
on_close = lambda do
logger.trace("connection is closed by someone")
@socket = nil
end

if @buffering
data_directory = Path.accidental_buffer + "#{target_node}"
FileUtils.mkdir_p(data_directory.to_s)
Expand All @@ -99,16 +84,18 @@ def connect
@socket = Coolio::TCPSocket.connect(@host, @port)
end
@socket.on_write_complete do
log_write_complete.call
logger.trace("write completed")
end
@socket.on_connect do
log_connect.call
logger.trace("connected")
end
@socket.on_connect_failed do
log_failed.call
logger.error("failed to connect")
@socket = nil
end
@socket.on_close do
on_close.call
logger.trace("connection is closed by someone")
@socket = nil
end
@loop.attach(@socket)
# logger.trace("connect: new socket watcher attached",
Expand Down
5 changes: 1 addition & 4 deletions lib/droonga/job_pusher.rb
Expand Up @@ -184,13 +184,10 @@ def close

private
def setup_connection
on_read = lambda do |data|
@connection.on_read do |data|
@ready = (data == JobProtocol::READY_SIGNAL)
@on_ready.call(self) if @on_ready
end
@connection.on_read do |data|
on_read.call(data)
end
end
end
end
Expand Down
5 changes: 1 addition & 4 deletions lib/droonga/job_receiver.rb
Expand Up @@ -50,17 +50,14 @@ def shutdown
private
def setup_receive_handler(connection)
unpacker = MessagePack::Unpacker.new
on_read = lambda do |data|
connection.on_read do |data|
logger.trace("on_read: start")
unpacker.feed_each(data) do |message|
@callback.call(message)
end
logger.trace("on_read: done")
send_ready(connection)
end
connection.on_read do |data|
on_read.call(data)
end
send_ready(connection)
end

Expand Down
5 changes: 1 addition & 4 deletions lib/droonga/process_supervisor.rb
Expand Up @@ -80,7 +80,7 @@ def refresh_node_reference
def create_input(raw_input)
input = Coolio::IO.new(raw_input)
line_buffer = LineBuffer.new
on_read = lambda do |data|
input.on_read do |data|
line_buffer.feed(data) do |line|
case line
when Messages::READY
Expand All @@ -90,9 +90,6 @@ def create_input(raw_input)
end
end
end
input.on_read do |data|
on_read.call(data)
end
input
end

Expand Down
10 changes: 2 additions & 8 deletions lib/droonga/serf/agent.rb
Expand Up @@ -107,24 +107,18 @@ def capture_output
end

output_line_buffer = LineBuffer.new
on_read_output = lambda do |data|
on_standard_output(output_line_buffer, data)
end
@output_io = Coolio::IO.new(output_read)
@output_io.on_read do |data|
on_read_output.call(data)
on_standard_output(output_line_buffer, data)
end
@loop.attach(@output_io)
# logger.trace("capture_output: new output_io watcher attached",
# :watcher => @output_io)

error_line_buffer = LineBuffer.new
on_read_error = lambda do |data|
on_error_output(error_line_buffer, data)
end
@error_io = Coolio::IO.new(error_read)
@error_io.on_read do |data|
on_read_error.call(data)
on_error_output(error_line_buffer, data)
end
@loop.attach(@error_io)
# logger.trace("capture_output: new error_io watcher attached",
Expand Down
9 changes: 3 additions & 6 deletions lib/droonga/session.rb
Expand Up @@ -115,16 +115,13 @@ def receive(name, value)
end
end

def set_timeout(loop, timeout, &on_timeout)
def set_timeout(loop, timeout, &block)
@timeout_timer = Coolio::TimerWatcher.new(timeout)
on_timer = lambda do
@timeout_timer.on_timer do
@timeout_timer.detach
@timeout_timer = nil
report_timeout_error
on_timeout.call
end
@timeout_timer.on_timer do
on_timer.call
yield
end
loop.attach(@timeout_timer)
end
Expand Down

0 comments on commit 2e3b979

Please sign in to comment.