Skip to content

Commit

Permalink
Allow :db/'db' option as well as :database/'database'
Browse files Browse the repository at this point in the history
This brings the connection options more inline with redis-rb

[closes faye#13]
  • Loading branch information
aaaronic committed Apr 25, 2016
1 parent 9c974be commit 4caad6a
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion lib/faye/redis.rb
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ def init
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'] || DEFAULT_DATABASE
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'] || ''
Expand Down

0 comments on commit 4caad6a

Please sign in to comment.