Burtiraven2/session_redis_public
1
0
Fork 0
mirror of https://github.com/camptocamp/odoo-cloud-platform.git synced 2026-06-23 18:04:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow to use a Redis Sentinel

Browse Source
This commit is contained in:
Guewen Baconnier
2017-05-16 09:07:59 +02:00
parent 2b81b7a6fb
commit c7240e1fe1
2 changed files with 31 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
session_redis/http.py
+27 -5
View File
@@ -17,6 +17,7 @@ _logger = logging.getLogger(__name__)
try:
import redis
from redis.sentinel import Sentinel
except ImportError:
redis = None # noqa
_logger.debug("Cannot 'import redis'.")
@@ -26,8 +27,18 @@ def is_true(strval):
return bool(strtobool(strval or '0'.lower()))
host = os.environ.get('ODOO_SESSION_REDIS_HOST') or 'localhost'
port = int(os.environ.get('ODOO_SESSION_REDIS_PORT') or 6379)
sentinel_host = os.environ.get('ODOO_SESSION_REDIS_SENTINEL_HOST')
sentinel_master_name = os.environ.get(
'ODOO_SESSION_REDIS_SENTINEL_MASTER_NAME'
)
if sentinel_host and not sentinel_master_name:
raise Exception(
"ODOO_SESSION_REDIS_SENTINEL_MASTER_NAME must be defined "
"when using session_redis"
)
sentinel_port = int(os.environ.get('ODOO_SESSION_REDIS_SENTINEL_PORT', 26379))
host = os.environ.get('ODOO_SESSION_REDIS_HOST', 'localhost')
port = int(os.environ.get('ODOO_SESSION_REDIS_PORT', 6379))
prefix = os.environ.get('ODOO_SESSION_REDIS_PREFIX')
password = os.environ.get('ODOO_SESSION_REDIS_PASSWORD')
expiration = os.environ.get('ODOO_SESSION_REDIS_EXPIRATION')
@@ -35,7 +46,12 @@ expiration = os.environ.get('ODOO_SESSION_REDIS_EXPIRATION')
@lazy_property
def session_store(self):
redis_client = redis.Redis(host=host, port=port, password=password)
if sentinel_host:
sentinel = Sentinel([(sentinel_host, sentinel_port)],
password=password)
redis_client = sentinel.master_for(sentinel_master_name)
else:
redis_client = redis.Redis(host=host, port=port, password=password)
return RedisSessionStore(redis=redis_client, prefix=prefix,
expiration=expiration,
session_class=http.OpenERPSession)
@@ -60,8 +76,14 @@ def purge_fs_sessions(path):
if is_true(os.environ.get('ODOO_SESSION_REDIS')):
_logger.debug("HTTP sessions stored in Redis %s:%s with prefix '%s'",
host, port, prefix or '')
if sentinel_host:
_logger.debug("HTTP sessions stored in Redis with prefix '%s'. "
"Using Sentinel on %s:%s",
sentinel_host, sentinel_port, prefix or '')
else:
_logger.debug("HTTP sessions stored in Redis with prefix '%s' on "
"%s:%s", host, port, prefix or '')
http.Root.session_store = session_store
http.session_gc = session_gc
# clean the existing sessions on the file system