YUKI Hiroshi
null+****@clear*****
Tue Mar 24 15:33:36 JST 2015
YUKI Hiroshi 2015-03-24 15:33:36 +0900 (Tue, 24 Mar 2015) New Revision: 0740ce7b0b85f1036a04aebdaca4aa826ea87d85 https://github.com/droonga/droonga-engine/commit/0740ce7b0b85f1036a04aebdaca4aa826ea87d85 Message: Remove needless class method of CatalogModifier Modified files: lib/droonga/catalog_modifier.rb lib/droonga/command/remote.rb Modified: lib/droonga/catalog_modifier.rb (+0 -8) =================================================================== --- lib/droonga/catalog_modifier.rb 2015-03-24 15:32:13 +0900 (e9b5e33) +++ lib/droonga/catalog_modifier.rb 2015-03-24 15:33:36 +0900 (83ed0d1) @@ -21,14 +21,6 @@ require "droonga/safe_file_writer" module Droonga class CatalogModifier - class << self - def modify(source_catalog) - new(source_catalog).modify do |generator, file| - yield(generator, file) - end - end - end - def initialize(source_catalog) @generator = CatalogGenerator.new @generator.load(source_catalog) Modified: lib/droonga/command/remote.rb (+5 -5) =================================================================== --- lib/droonga/command/remote.rb 2015-03-24 15:32:13 +0900 (2400e91) +++ lib/droonga/command/remote.rb 2015-03-24 15:33:36 +0900 (22a7886) @@ -241,7 +241,7 @@ module Droonga @serf.join(*@other_hosts) log("update catalog.json from fetched catalog") - CatalogModifier.modify(catalog) do |modifier, file| + CatalogModifier.new(catalog).modify do |modifier, file| modifier.datasets[dataset_name].replicas.hosts += [joining_host] modifier.datasets[dataset_name].replicas.hosts.uniq! @service_installation.ensure_correct_file_permission(file) @@ -338,7 +338,7 @@ module Droonga @serf.join(*hosts) log("setting replicas to the cluster") - CatalogModifier.modify(catalog) do |modifier, file| + CatalogModifier.new(catalog).modify do |modifier, file| modifier.datasets[dataset].replicas.hosts = hosts @service_installation.ensure_correct_file_permission(file) end @@ -358,7 +358,7 @@ module Droonga @serf.join(*added_hosts) log("adding replicas to the cluster") - CatalogModifier.modify(catalog) do |modifier, file| + CatalogModifier.new(catalog).modify do |modifier, file| modifier.datasets[dataset].replicas.hosts += added_hosts modifier.datasets[dataset].replicas.hosts.uniq! @service_installation.ensure_correct_file_permission(file) @@ -374,7 +374,7 @@ module Droonga log("removing replicas: #{hosts.join(",")}") log("removing replicas from the cluster") - CatalogModifier.modify(catalog) do |modifier, file| + CatalogModifier.new(catalog).modify do |modifier, file| modifier.datasets[dataset].replicas.hosts -= hosts @service_installation.ensure_correct_file_permission(file) end @@ -389,7 +389,7 @@ module Droonga log("unjoining replicas: #{hosts.join(",")}") log("unjoining from the cluster") - CatalogModifier.modify(catalog) do |modifier, file| + CatalogModifier.new(catalog).modify do |modifier, file| if unjoining_node? modifier.datasets[dataset].replicas.hosts = hosts else -------------- next part -------------- HTML����������������������������...Download
