Skip to content

Redis rb options support #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aaaronic wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Redis rb options support #14

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9c974be
Allow options keys to be strings as well as symbols
aaaronic Apr 25, 2016
4caad6a
Allow :db/'db' option as well as :database/'database'
aaaronic Apr 25, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions lib/faye/redis.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,15 @@ def initialize(server, options)
def init
return if @redis

uri = @options[:uri] || nil
host = @options[:host] || DEFAULT_HOST
port = @options[:port] || DEFAULT_PORT
db = @options[:database] || DEFAULT_DATABASE
auth = @options[:password] || nil
gc = @options[:gc] || DEFAULT_GC
@ns = @options[:namespace] || ''
socket = @options[:socket] || nil
uri = @options[:uri] || @options['uri'] || nil
host = @options[:host] || @options['host'] || DEFAULT_HOST
port = @options[:port] || @options['port'] || DEFAULT_PORT
db = @options[:database] || @options['database'] ||
@options[:db] || @options['db'] || DEFAULT_DATABASE
auth = @options[:password] || @options['password'] || nil
gc = @options[:gc] || @options['gc'] || DEFAULT_GC
@ns = @options[:namespace] || @options['namespace'] || ''
socket = @options[:socket] || @options['socket'] || nil

if uri
@redis = EventMachine::Hiredis.connect(uri)
Expand Down