diff --git a/lib/faye/redis.rb b/lib/faye/redis.rb index 5dd09fb..80602b5 100644 --- a/lib/faye/redis.rb +++ b/lib/faye/redis.rb @@ -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)