Merge pull request #36 from splitio/stricredis-parameters

Adding StrictRedis parameters

Author: sarrubia

splitio/config.py

@@ -32,7 +32,25 @@
     'redisHost': 'localhost',
     'redisPort': 6379,
     'redisDb': 0,
-    'redisPassword': None
+    'redisPassword': None,
+    'redisSocketTimeout': None,
+    'redisSocketConnectTimeout': None,
+    'redisSocketKeepalive': None,
+    'redisSocketKeepaliveOptions': None,
+    'redisConnectionPool': None,
+    'redisUnixSocketPath': None,
+    'redisEncoding': 'utf-8',
+    'redisEncodingErrors': 'strict',
+    'redisCharset': None,
+    'redisErrors': None,
+    'redisDecodeResponses': False,
+    'redisRetryOnTimeout': False,
+    'redisSsl': False,
+    'redisSslKeyfile': None,
+    'redisSslCertfile': None,
+    'redisSslCertReqs': None,
+    'redisSslCaCerts': None,
+    'redisMaxConnections': None
 }
 
 MAX_INTERVAL = 180

splitio/redis_support.py

@@ -710,7 +710,7 @@ def get_redis(config):
     :return: A redis client
     """
     if 'redisFactory' in config:
-        redis_factory = import_from_string(config['redisFactory'])
+        redis_factory = import_from_string(config['redisFactory'],'redisFactory')
         return redis_factory()
 
     return default_redis_factory(config)
@@ -727,5 +727,33 @@ def default_redis_factory(config):
     port = config.get('redisPort', 6379)
     db = config.get('redisDb', 0)
     password = config.get('redisPassword', None)
-    redis = StrictRedis(host=host, port=port, db=db, password=password)
+    socket_timeout = config.get('redisSocketTimeout', None)
+    socket_connect_timeout = config.get('redisSocketConnectTimeout', None)
+    socket_keepalive = config.get('redisSocketKeepalive', None)
+    socket_keepalive_options = config.get('redisSocketKeepaliveOptions', None)
+    connection_pool = config.get('redisConnectionPool', None)
+    unix_socket_path = config.get('redisUnixSocketPath', None)
+    encoding = config.get('redisEncoding', 'utf-8')
+    encoding_errors = config.get('redisEncodingErrors', 'strict')
+    charset = config.get('redisCharset', None)
+    errors = config.get('redisErrors', None)
+    decode_responses = config.get('redisDecodeResponses', False)
+    retry_on_timeout = config.get('redisRetryOnTimeout', False)
+    ssl = config.get('redisSsl', False)
+    ssl_keyfile = config.get('redisSslKeyfile', None)
+    ssl_certfile = config.get('redisSslCertfile', None)
+    ssl_cert_reqs = config.get('redisSslCertReqs', None)
+    ssl_ca_certs = config.get('redisSslCaCerts', None)
+    max_connections = config.get('redisMaxConnections', None)
+
+    redis = StrictRedis(host=host, port=port, db=db, password=password, socket_timeout=socket_timeout,
+                 socket_connect_timeout=socket_connect_timeout,
+                 socket_keepalive=socket_keepalive, socket_keepalive_options=socket_keepalive_options,
+                 connection_pool=connection_pool, unix_socket_path=unix_socket_path,
+                 encoding=encoding, encoding_errors=encoding_errors,
+                 charset=charset, errors=errors,
+                 decode_responses=decode_responses, retry_on_timeout=retry_on_timeout,
+                 ssl=ssl, ssl_keyfile=ssl_keyfile, ssl_certfile=ssl_certfile,
+                 ssl_cert_reqs=ssl_cert_reqs, ssl_ca_certs=ssl_ca_certs,
+                 max_connections=max_connections)
     return redis