redis_ring 0.1.1 → 0.1.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    redis_ring (0.0.2)
+    redis_ring (0.1.1)
       daemons-mikehale
       json
       sinatra

data/config/redis-ring.sample.yml

@@ -1,3 +1,7 @@
+# You can have multiple clusters running in the same zookeeper
+# by providing different cluster names
+cluster_name: redis-ring
+
 # By default RedisRing tries to guess the local IP address
 # setting host_name should be necessary only if that is not possible
 #host_name: localhost

data/lib/redis_ring/application.rb

@@ -11,7 +11,8 @@ module RedisRing
       @master_rpc = MasterRPC.new(http_client)
       @slave_rpc = SlaveRPC.new(http_client)
       @node_provider = NodeProvider.new(slave_rpc)
-      @zookeeper_connection = ZookeeperConnection.new(config.host_name,
+      @zookeeper_connection = ZookeeperConnection.new(config.cluster_name,
+                                                      config.host_name,
                                                       config.base_port,
                                                       config.zookeeper_address)
       @master = Master.new(zookeeper_connection, config.ring_size, node_provider)

data/lib/redis_ring/configuration.rb

@@ -6,7 +6,7 @@ module RedisRing
 
   class Configuration
 
-    PARAMETERS = [:host_name, :base_port, :ring_size, :redis_path, :redis_config_template_path,
+    PARAMETERS = [:cluster_name, :host_name, :base_port, :ring_size, :redis_path, :redis_config_template_path,
       :total_vm_size, :base_directory, :password, :total_max_memory, :vm_page_size, :zookeeper_address]
 
     attr_reader *PARAMETERS
@@ -41,6 +41,7 @@ module RedisRing
     end
 
     def set_defaults
+      self.cluster_name ||= "redis-ring"
       self.host_name ||=  guess_host_name
       self.base_port ||= 6400
       self.ring_size ||= 32

data/lib/redis_ring/version.rb

@@ -1,3 +1,3 @@
 module RedisRing
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/redis_ring/zookeeper_connection.rb

@@ -4,12 +4,12 @@ module RedisRing
 
     attr_reader :current_node
 
-    def initialize(host_name, base_port, zookeeper_address)
+    def initialize(cluster_name, host_name, base_port, zookeeper_address)
       @host_name = host_name
       @base_port = base_port
       @zookeeper_address = zookeeper_address
       @connected = false
-      @base_path = "/nodes"
+      @base_path = "/#{cluster_name}"
       @mutex = Mutex.new
     end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Adam Pohorecki
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-22 00:00:00 +01:00
+date: 2011-04-11 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency