Merge branch 'master' of github.com:defunkt/resque

Author: defunkt

lib/resque.rb

@@ -49,6 +49,15 @@ def redis
     self.redis
   end
 
+  def redis_id
+    # support 1.x versions of redis-rb
+    if redis.respond_to?(:server)
+      redis.server
+    else
+      redis.client.id
+    end
+  end
+
   # The `before_first_fork` hook will be run in the **parent** process
   # only once, before forking to run the first job. Be careful- any
   # changes you make will be permanent for the lifespan of the
@@ -97,7 +106,7 @@ def after_fork=(after_fork)
   end
 
   def to_s
-    "Resque Client connected to #{redis.server}"
+    "Resque Client connected to #{redis_id}"
   end
 
 
@@ -270,7 +279,7 @@ def info
       :workers   => workers.size.to_i,
       :working   => working.size,
       :failed    => Stat[:failed],
-      :servers   => [redis.server],
+      :servers   => [redis_id],
       :environment  => defined?(RAILS_ENV) ? RAILS_ENV : (ENV['RACK_ENV'] || 'development')
     }
   end

lib/resque/server.rb

@@ -106,7 +106,7 @@ def show(page, layout = true)
       begin
         erb page.to_sym, {:layout => layout}, :resque => Resque
       rescue Errno::ECONNREFUSED
-        erb :error, {:layout => false}, :error => "Can't connect to Redis! (#{Resque.redis.server})"
+        erb :error, {:layout => false}, :error => "Can't connect to Redis! (#{Resque.redis_id})"
       end
     end
 
@@ -124,7 +124,7 @@ def show(page, layout = true)
         show page
       end
     end
-    
+
     post "/queues/:id/remove" do
       Resque.remove_queue(params[:id])
       redirect u('queues')
@@ -150,7 +150,7 @@ def show(page, layout = true)
       Resque::Failure.clear
       redirect u('failed')
     end
-    
+
     get "/failed/requeue/:index" do
       Resque::Failure.requeue(params[:index])
       if request.xhr?

lib/resque/server/views/layout.erb

@@ -37,7 +37,7 @@
 
 <div id="footer">
   <p>Powered by <a href="http://github.com/defunkt/resque">Resque</a> v<%=Resque::Version%></p>
-  <p>Connected to Redis namespace <%= Resque.redis.namespace %> on <%=Resque.redis.server%></p>
+  <p>Connected to Redis namespace <%= Resque.redis.namespace %> on <%=Resque.redis_id%></p>
 </div>
 
 </body>

lib/resque/server/views/stats.erb

@@ -22,7 +22,7 @@
 
 <% elsif params[:id] == 'redis' %>
 
-  <h1><%= resque.redis.server %></h1>
+  <h1><%= resque.redis_id %></h1>
   <table class='stats'>
   <% for key, value in resque.redis.info.to_a.sort_by { |i| i[0].to_s } %>
     <tr>

test/redis-test.conf

@@ -113,20 +113,3 @@ databases 16
 # single TCP packet. Uses a bit more CPU but most of the times it is a win
 # in terms of number of queries per second. Use 'yes' if unsure.
 glueoutputbuf yes
-
-# Use object sharing. Can save a lot of memory if you have many common
-# string in your dataset, but performs lookups against the shared objects
-# pool so it uses more CPU and can be a bit slower. Usually it's a good
-# idea.
-#
-# When object sharing is enabled (shareobjects yes) you can use
-# shareobjectspoolsize to control the size of the pool used in order to try
-# object sharing. A bigger pool size will lead to better sharing capabilities.
-# In general you want this value to be at least the double of the number of
-# very common strings you have in your dataset.
-#
-# WARNING: object sharing is experimental, don't enable this feature
-# in production before of Redis 1.0-stable. Still please try this feature in
-# your development environment so that we can test it better.
-shareobjects no
-shareobjectspoolsize 1024

test/resque_test.rb

@@ -216,7 +216,7 @@
     assert_equal 3, stats[:queues]
     assert_equal 3, stats[:processed]
     assert_equal 1, stats[:failed]
-    assert_equal ['localhost:9736'], stats[:servers]
+    assert_equal [Resque.redis.respond_to?(:server) ? 'localhost:9736' : 'redis://localhost:9736/0'], stats[:servers]
   end
 
   test "decode bad json" do