Merge pull request #2719 from cenit-io/develop

Develop
cenit-io · Sep 22, 2019 · e83f923 · e83f923
2 parents f395178 + 61cdc31
commit e83f923
Showing 1 changed file with 15 additions and 1 deletion.
diff --git a/lib/cenit/redis.rb b/lib/cenit/redis.rb
@@ -10,7 +10,21 @@ def client?
 
       def client
         unless instance_variable_defined?(:@redis_client)
-          client = ::Redis.new(host: ENV["REDIS_HOST"], port: 6379, db: 15)
+          client =
+            if (redis_url = ENV['REDIS_URL'])
+              # specify a connection option as a redis:// URL
+              # e.g "redis://:p4ssw0rd@10.0.1.1:6380/15"
+              ::Redis.new(url: redis_url)
+            else
+              # Defauls values similar to the redis gem
+              # https://github.com/redis/redis-rb/blob/master/lib/redis/client.rb#L10-L26
+              redis_host = ENV['REDIS_HOST'] || '127.0.0.1'
+              redis_port = (ENV['REDIS_PORT'] || 6379).to_i
+              redis_db = (ENV['REDIS_DB'] || 0).to_i
+              redis_password = ENV['REDIS_PASSWORD'] || nil
+
+              ::Redis.new(host: redis_host, port: redis_port, db: redis_db, password: redis_password)
+            end
           client =
             begin
               client.ping