Kouhei Sutou
null+****@clear*****
Mon May 26 16:20:43 JST 2014
Kouhei Sutou 2014-05-26 16:20:43 +0900 (Mon, 26 May 2014) New Revision: fd58d8529f6669581fecde09b99e8e4743cc7749 https://github.com/droonga/droonga-engine/commit/fd58d8529f6669581fecde09b99e8e4743cc7749 Message: Remove "_dir" for consistency `Droonga.base_path` doesn't have "_dir". Modified files: lib/droonga/base_path.rb lib/droonga/command/serf_event_handler.rb lib/droonga/engine.rb lib/droonga/live_nodes_list_observer.rb Modified: lib/droonga/base_path.rb (+1 -1) =================================================================== --- lib/droonga/base_path.rb 2014-05-26 16:19:12 +0900 (84b7657) +++ lib/droonga/base_path.rb 2014-05-26 16:20:43 +0900 (e0907d4) @@ -23,7 +23,7 @@ module Droonga @base_path ||= Pathname.new(ENV[BASE_DIR_ENV_NAME] || Dir.pwd) end - def state_dir_path + def state_path base_path + "state" end end Modified: lib/droonga/command/serf_event_handler.rb (+1 -1) =================================================================== --- lib/droonga/command/serf_event_handler.rb 2014-05-26 16:19:12 +0900 (05ed117) +++ lib/droonga/command/serf_event_handler.rb 2014-05-26 16:20:43 +0900 (6e09e85) @@ -69,7 +69,7 @@ module Droonga end def list_file - @list_file ||= Droonga.state_dir_path + LiveNodesListObserver::LIST_FILE_NAME + @list_file ||= Droonga.state_path + LiveNodesListObserver::LIST_FILE_NAME end def output_live_nodes Modified: lib/droonga/engine.rb (+2 -2) =================================================================== --- lib/droonga/engine.rb 2014-05-26 16:19:12 +0900 (ef4c30a) +++ lib/droonga/engine.rb 2014-05-26 16:20:43 +0900 (243cd23) @@ -101,7 +101,7 @@ module Droonga end def last_processed_timestamp_file - @last_processed_timestamp_file ||= File.join(Droonga.state_dir_path, LAST_PROCESSED_TIMESTAMP) + @last_processed_timestamp_file ||= File.join(Droonga.state_path, LAST_PROCESSED_TIMESTAMP) end def effective_message?(message) @@ -127,7 +127,7 @@ module Droonga end def effective_message_timestamp_file - @effective_message_timestamp_file ||= File.join(Droonga.state_dir_path, EFFECTIVE_MESSAGE_TIMESTAMP) + @effective_message_timestamp_file ||= File.join(Droonga.state_path, EFFECTIVE_MESSAGE_TIMESTAMP) end def log_tag Modified: lib/droonga/live_nodes_list_observer.rb (+1 -1) =================================================================== --- lib/droonga/live_nodes_list_observer.rb 2014-05-26 16:19:12 +0900 (d850599) +++ lib/droonga/live_nodes_list_observer.rb 2014-05-26 16:20:43 +0900 (7a6743e) @@ -65,7 +65,7 @@ module Droonga private def prepare_file_path path = ENV["DROONGA_LIVE_NODES_LIST"] || LIST_FILE_NAME - File.expand_path(path, Droonga.state_dir_path) + File.expand_path(path, Droonga.state_path) end def log_tag -------------- next part -------------- HTML����������������������������...下載
