Kouhei Sutou
null+****@clear*****
Sat Mar 22 00:48:31 JST 2014
Kouhei Sutou 2014-03-22 00:48:31 +0900 (Sat, 22 Mar 2014) New Revision: 5b3f0e14ec5eba0cb39c98fbde70ce8a3ec64778 https://github.com/droonga/fluent-plugin-droonga/commit/5b3f0e14ec5eba0cb39c98fbde70ce8a3ec64778 Message: Use more concrete name job -> message Modified files: lib/droonga/processor.rb lib/droonga/server.rb lib/droonga/slice.rb lib/droonga/worker.rb Renamed files: lib/droonga/job_protocol.rb (from lib/droonga/job_message_protocol.rb) lib/droonga/job_pusher.rb (from lib/droonga/message_pusher.rb) lib/droonga/job_receiver.rb (from lib/droonga/message_receiver.rb) Renamed: lib/droonga/job_protocol.rb (+1 -1) 96% =================================================================== --- lib/droonga/job_message_protocol.rb 2014-03-22 00:37:53 +0900 (942cd9b) +++ lib/droonga/job_protocol.rb 2014-03-22 00:48:31 +0900 (cac8629) @@ -14,7 +14,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA module Droonga - module JobMessageProtocol + module JobProtocol READY_SIGNAL = "R" end end Renamed: lib/droonga/job_pusher.rb (+4 -4) 95% =================================================================== --- lib/droonga/message_pusher.rb 2014-03-22 00:37:53 +0900 (74c6265) +++ lib/droonga/job_pusher.rb 2014-03-22 00:48:31 +0900 (ec3dbf7) @@ -16,10 +16,10 @@ require "msgpack" require "droonga/logger" -require "droonga/job_message_protocol" +require "droonga/job_protocol" module Droonga - class MessagePusher + class JobPusher include Loggable attr_reader :socket_path @@ -61,7 +61,7 @@ module Droonga private def log_tag - "message_pusher" + "job_pusher" end class JobQueue @@ -123,7 +123,7 @@ module Droonga private def setup_connection on_read = lambda do |data| - @ready = (data == JobMessageProtocol::READY_SIGNAL) + @ready = (data == JobProtocol::READY_SIGNAL) @job_queue.ready(self) end @connection.on_read do |data| Renamed: lib/droonga/job_receiver.rb (+4 -4) 92% =================================================================== --- lib/droonga/message_receiver.rb 2014-03-22 00:37:53 +0900 (fcfe5a2) +++ lib/droonga/job_receiver.rb 2014-03-22 00:48:31 +0900 (63f1c92) @@ -16,10 +16,10 @@ require "msgpack" require "droonga/loggable" -require "droonga/job_message_protocol" +require "droonga/job_protocol" module Droonga - class MessageReceiver + class JobReceiver include Loggable def initialize(loop, socket_path, &callback) @@ -60,11 +60,11 @@ module Droonga end def send_ready(connection) - connection.write(JobMessageProtocol::READY_SIGNAL) + connection.write(JobProtocol::READY_SIGNAL) end def log_tag - "message_receiver" + "job_receiver" end end end Modified: lib/droonga/processor.rb (+3 -3) =================================================================== --- lib/droonga/processor.rb 2014-03-22 00:37:53 +0900 (f78b489) +++ lib/droonga/processor.rb 2014-03-22 00:48:31 +0900 (ec45c3c) @@ -20,9 +20,9 @@ module Droonga class Processor include Loggable - def initialize(loop, message_pusher, options={}) + def initialize(loop, job_pusher, options={}) @loop = loop - @message_pusher = message_pusher + @job_pusher = job_pusher @options = options @n_workers = @options[:n_workers] || 0 end @@ -47,7 +47,7 @@ module Droonga if @n_workers.zero? or synchronous @handler_runner.process(message) else - @message_pusher.push(message) + @job_pusher.push(message) end else logger.trace("process: ignore #{type}") Modified: lib/droonga/server.rb (+2 -2) =================================================================== --- lib/droonga/server.rb 2014-03-22 00:37:53 +0900 (2b023bc) +++ lib/droonga/server.rb 2014-03-22 00:48:31 +0900 (ad64302) @@ -21,8 +21,8 @@ module Droonga module Server def before_run Droonga.logger.trace("#{log_tag}: before_run: start") - config[:message_pusher].close - config.delete(:message_pusher) + config[:job_pusher].close + config.delete(:job_pusher) Droonga.logger.trace("#{log_tag}: before_run: done") end Modified: lib/droonga/slice.rb (+7 -7) =================================================================== --- lib/droonga/slice.rb 2014-03-22 00:37:53 +0900 (e46f9ae) +++ lib/droonga/slice.rb 2014-03-22 00:48:31 +0900 (5e6ac27) @@ -19,7 +19,7 @@ require "droonga/loggable" require "droonga/server" require "droonga/worker" require "droonga/event_loop" -require "droonga/message_pusher" +require "droonga/job_pusher" require "droonga/processor" module Droonga @@ -30,22 +30,22 @@ module Droonga @options = options @n_workers = @options[:n_workers] || 0 @loop = loop - @message_pusher = MessagePusher.new(@loop, @options[:database]) - @processor = Processor.new(@loop, @message_pusher, @options) + @job_pusher = JobPusher.new(@loop, @options[:database]) + @processor = Processor.new(@loop, @job_pusher, @options) @supervisor = nil end def start ensure_database @processor.start - @message_pusher.start + @job_pusher.start start_supervisor if @n_workers > 0 end def shutdown logger.trace("shutdown: start") shutdown_supervisor if @supervisor - @message_pusher.shutdown + @job_pusher.shutdown @processor.shutdown logger.trace("shutdown: done") end @@ -83,8 +83,8 @@ module Droonga :log_level => logger.level, :server_process_name => "Server[#{@options[:database]}] #$0", :worker_process_name => "Worker[#{@options[:database]}] #$0", - :message_receive_socket_path => @message_pusher.socket_path, - :message_pusher => @message_pusher, + :job_receive_socket_path => @job_pusher.socket_path, + :job_pusher => @job_pusher, } @options.merge(force_options) end Modified: lib/droonga/worker.rb (+5 -5) =================================================================== --- lib/droonga/worker.rb 2014-03-22 00:37:53 +0900 (4652727) +++ lib/droonga/worker.rb 2014-03-22 00:48:31 +0900 (6f8d3f4) @@ -15,7 +15,7 @@ require "droonga/event_loop" require "droonga/handler_runner" -require "droonga/message_receiver" +require "droonga/job_receiver" module Droonga module Worker @@ -24,8 +24,8 @@ module Droonga @loop = EventLoop.new(@raw_loop) @handler_runner = HandlerRunner.new(@loop, config.merge(:dispatcher => nil)) - receive_socket_path = config[:message_receive_socket_path] - @message_receiver = MessageReceiver.new(@loop, receive_socket_path) do |message| + receive_socket_path = config[:job_receive_socket_path] + @job_receiver = JobReceiver.new(@loop, receive_socket_path) do |message| process(message) end end @@ -33,7 +33,7 @@ module Droonga def run Droonga.logger.trace("#{log_tag}: run: start") @handler_runner.start - @message_receiver.start + @job_receiver.start @raw_loop.run @handler_runner.shutdown Droonga.logger.trace("#{log_tag}: run: done") @@ -41,7 +41,7 @@ module Droonga def stop Droonga.logger.trace("#{log_tag}: stop: start") - @message_receiver.shutdown + @job_receiver.shutdown @raw_loop.stop @loop.break_current_loop Droonga.logger.trace("#{log_tag}: stop: done") -------------- next part -------------- HTML����������������������������...Download