herdis 0.0.5 → 0.0.6

data/lib/herdis/handlers/shards.rb

@@ -0,0 +1,21 @@
+
+module Herdis
+
+   module Handlers
+
+    class Shards < Goliath::API
+      include Common
+
+      def response(env)
+        if Herdis::Plugins::ShepherdConnection.shepherd.nil?
+          [404, {}, ""]
+        else
+          [200, {}, Herdis::Plugins::ShepherdConnection.shepherd.shard_status]
+        end
+      end
+      
+    end
+
+  end
+
+end

data/lib/herdis/server.rb

@@ -18,6 +18,7 @@ require 'herdis/rack/favicon'
 require 'herdis/rack/host_parameter'
 require 'herdis/handlers/common'
 require 'herdis/handlers/cluster'
+require 'herdis/handlers/shards'
 require 'herdis/handlers/join_cluster'
 require 'herdis/handlers/remove_shepherd'
 require 'herdis/handlers/shutdown'
@@ -41,6 +42,7 @@ module Herdis
     get '/', Herdis::Handlers::Info
     get '/cluster', Herdis::Handlers::Cluster
     get '/sanity', Herdis::Handlers::Sanity
+    get '/shards', Herdis::Handlers::Shards
 
     post '/', Herdis::Handlers::JoinCluster
 

data/lib/herdis/shepherd.rb

@@ -276,7 +276,8 @@ module Herdis
         "check_slave_timer" => CHECK_SLAVE_TIMER,
         "check_predecessor_timer" => CHECK_PREDECESSOR_TIMER,
         "sanity" => "#{url}/sanity",
-        "cluster" => "#{url}/cluster"
+        "cluster" => "#{url}/cluster",
+        "shards" => "#{url}/shards"
       }
     end
 
@@ -314,9 +315,11 @@ module Herdis
     def shard_status
       rval = []
       cluster_status.each do |shepherd_id, shepherd_status|
+        shepherd_url = URI.parse(shepherd_status["url"])
+        shepherd_host = shepherd_url.host
         shepherd_status["masters"].each do |shard_id|
           if rval[shard_id.to_i].nil?
-            rval[shard_id.to_i] = "redis://#{host}:#{shard_id.to_i + shepherd_status["first_port"].to_i}/"
+            rval[shard_id.to_i] = "redis://#{shepherd_host}:#{shard_id.to_i + shepherd_status["first_port"].to_i}/"
           else
             raise Goliath::Validation::InternalServerError.new("Duplicate masters: #{shard_id}")
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: herdis
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hiredis
-  requirement: &70357281273960 !ruby/object:Gem::Requirement
+  requirement: &70143808249500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70357281273960
+  version_requirements: *70143808249500
 - !ruby/object:Gem::Dependency
   name: em-synchrony
-  requirement: &70357281273400 !ruby/object:Gem::Requirement
+  requirement: &70143808248940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70357281273400
+  version_requirements: *70143808248940
 - !ruby/object:Gem::Dependency
   name: em-http-request
-  requirement: &70357281272960 !ruby/object:Gem::Requirement
+  requirement: &70143808248500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70357281272960
+  version_requirements: *70143808248500
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70357281272540 !ruby/object:Gem::Requirement
+  requirement: &70143808248080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70357281272540
+  version_requirements: *70143808248080
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70357281272100 !ruby/object:Gem::Requirement
+  requirement: &70143808247640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70357281272100
+  version_requirements: *70143808247640
 - !ruby/object:Gem::Dependency
   name: goliath
-  requirement: &70357281271660 !ruby/object:Gem::Requirement
+  requirement: &70143808247200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70357281271660
+  version_requirements: *70143808247200
 description: ! 'A Redis herder for simplifying Redis presharding
 
 '
@@ -98,6 +98,7 @@ files:
 - lib/herdis/handlers/remove_shards.rb
 - lib/herdis/handlers/remove_shepherd.rb
 - lib/herdis/handlers/sanity.rb
+- lib/herdis/handlers/shards.rb
 - lib/herdis/handlers/shutdown.rb
 - lib/herdis/plugins/shepherd_connection.rb
 - lib/herdis/rack/default_headers.rb