Skip to content

Commit 1821fcd

Browse files
committed
removing DistRedis support until we get passing tests
1 parent ef83965 commit 1821fcd

File tree

2 files changed

+2
-9
lines changed

2 files changed

+2
-9
lines changed

lib/resque.rb

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,14 @@ module Resque
2626
# 1. A 'hostname:port' string
2727
# 2. A 'hostname:port:db' string (to select the Redis db)
2828
# 3. An instance of `Redis`
29-
# 4. An instance of `DistRedis`
3029
def redis=(server)
3130
case server
3231
when String
3332
host, port, db = server.split(':')
3433
redis = Redis.new(:host => host, :port => port,
3534
:thread_safe => true, :db => db)
3635
@redis = Redis::Namespace.new(:resque, :redis => redis)
37-
when Redis, DistRedis
36+
when Redis
3837
@redis = Redis::Namespace.new(:resque, :redis => server)
3938
else
4039
raise "I don't know what to do with #{server.inspect}"
@@ -230,8 +229,7 @@ def info
230229
# Returns an array of all known Resque keys in Redis. Redis' KEYS operation
231230
# is O(N) for the keyspace, so be careful - this can be slow for big databases.
232231
def keys
233-
redis_keys = redis.keys("*").flatten
234-
redis_keys.map do |key|
232+
redis.keys("*").map do |key|
235233
key.sub('resque:', '')
236234
end
237235
end

test/resque_test.rb

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
require File.dirname(__FILE__) + '/test_helper'
2-
# require 'dist_redis'
32

43
context "Resque" do
54
setup do
@@ -10,10 +9,6 @@
109
Resque.push(:people, { 'name' => 'mark' })
1110
end
1211

13-
# test "can use DistRedis" do
14-
# assert Resque.redis = DistRedis.new({:hosts => ['localhost:9736', 'localhost:9736']})
15-
# end
16-
1712
test "can put jobs on a queue" do
1813
assert Resque::Job.create(:jobs, 'SomeJob', 20, '/tmp')
1914
assert Resque::Job.create(:jobs, 'SomeJob', 20, '/tmp')

0 commit comments

Comments
 (0)