redis_ring_client 0.1.1 → 0.1.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    redis_ring_client (0.1.0)
+    redis_ring_client (0.1.1)
       json
       redis
       zookeeper

data/lib/redis_ring/client/ring_meta_data.rb

@@ -5,10 +5,11 @@ module RedisRing
 
     class RingMetaData
 
-      attr_reader :zookeeper_addr, :zookeeper
+      attr_reader :zookeeper_addr, :zookeeper, :cluster_name
 
-      def initialize(zookeeper_addr)
+      def initialize(zookeeper_addr, cluster_name)
         @zookeeper_addr = zookeeper_addr
+        @cluster_name = cluster_name
       end
 
       def reload!
@@ -44,7 +45,7 @@ module RedisRing
       def get_shards_json_string(retries = 0)
         @zookeeper ||= self.class.zookeeper(zookeeper_addr)
         @watcher = Zookeeper::WatcherCallback.new
-        resp = @zookeeper.get(:path => "/cluster_status", :watcher => @watcher, :watcher_context => "/cluster_status")
+        resp = @zookeeper.get(:path => "/#{cluster_name}_cluster_status", :watcher => @watcher, :watcher_context => "/#{cluster_name}/cluster_status")
         return resp[:data]
       rescue ZookeeperExceptions::ZookeeperException::ConnectionClosed
         raise if retries == 4

data/lib/redis_ring/client/ring_proxy.rb

@@ -154,6 +154,7 @@ module RedisRing
         @zookeeper = opts[:zookeeper] || 'localhost:2181'
         @db = opts[:db] || 0
         @password = opts[:password]
+        @cluster_name = opts[:cluster_name] || 'redis-ring'
       end
 
       def connection_for_key(key)
@@ -174,7 +175,7 @@ module RedisRing
       protected
 
       def ring_meta_data
-        @ring_meta_data ||= RingMetaData.new(@zookeeper)
+        @ring_meta_data ||= RingMetaData.new(@zookeeper, @cluster_name)
       end
 
       def sharder

data/lib/redis_ring/client/version.rb

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

data/spec/redis_ring/client/ring_meta_data_spec.rb

@@ -29,7 +29,7 @@ describe RedisRing::Client::RingMetaData do
   end
 
   it "should download json lazily" do
-    @metadata = RedisRing::Client::RingMetaData.new('localhost:2181')
+    @metadata = RedisRing::Client::RingMetaData.new('localhost:2181', 'some-name')
 
     stub_zookeeper
 
@@ -40,7 +40,7 @@ describe RedisRing::Client::RingMetaData do
     before(:each) do
       stub_zookeeper
 
-      @metadata = RedisRing::Client::RingMetaData.new('localhost:2181')
+      @metadata = RedisRing::Client::RingMetaData.new('localhost:2181', 'some-name')
     end
 
     it "should have ring_size of 10" do

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-21 00:00:00 +01:00
+date: 2011-04-11 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency