kotovalexarian-likes-github/mperham--sidekiq
1
0
Fork 0
mirror of https://github.com/mperham/sidekiq.git synced 2022-11-09 13:52:34 -05:00
Code Releases Activity

fix merge conflicts

Browse source
This commit is contained in:
Ryan LeCompte 2012-02-09 22:04:22 -08:00
parent 19527698c9
commit 12d95dde6c
1 changed files with 0 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/sidekiq/redis_connection.rb
View file

@ -3,23 +3,11 @@ require 'redis/namespace'
module Sidekiq module Sidekiq
class RedisConnection class RedisConnection
<<<<<<< HEAD
def self.create(options={}) def self.create(options={})
url = options[:url] || ENV['REDISTOGO_URL'] || 'redis://localhost:6379/0' url = options[:url] || ENV['REDISTOGO_URL'] || 'redis://localhost:6379/0'
client = build_client(url, options[:namespace]) client = build_client(url, options[:namespace])
return ConnectionPool.new { client } if options[:use_pool] return ConnectionPool.new { client } if options[:use_pool]
client client
=======
def self.create(url=nil, namespace=nil, pool=true)
@namespace = namespace
@url = url
if pool
ConnectionPool.new { connect }
else
connect
end
>>>>>>> c2877d690fac59ee18006912aeecd3babb072dc1
end end
def self.build_client(url, namespace) def self.build_client(url, namespace)