cartodb4/dataservices-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for crash when sentinel_master_id is absent in config

Browse Source
This commit is contained in:
Rafa de la Torre 2016-10-06 15:04:25 +02:00
parent 00e6cace76
commit 6d0ad85d48
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/lib/python/cartodb_services/cartodb_services/refactor/storage/redis_connection_config.py
View File

@ -55,9 +55,9 @@ class RedisConnectionConfigBuilder(object):
host = conf['redis_host'] host = conf['redis_host']
port = conf['redis_port'] port = conf['redis_port']
timeout = conf['timeout'] or self.DEFAULT_TIMEOUT timeout = conf.get('timeout', self.DEFAULT_TIMEOUT) or self.DEFAULT_TIMEOUT
db = conf['redis_db'] or self.DEFAULT_USER_DB db = conf.get('redis_db', self.DEFAULT_USER_DB) or self.DEFAULT_USER_DB
sentinel_id = conf['sentinel_master_id'] sentinel_id = conf.get('sentinel_master_id', None)
return RedisConnectionConfig(host, port, timeout, db, sentinel_id) return RedisConnectionConfig(host, port, timeout, db, sentinel_id)

14
server/lib/python/cartodb_services/test/refactor/storage/test_redis_connection_config.py
View File

@ -99,3 +99,17 @@ class TestRedisMetricsConnectionConfigBuilder(TestCase):
assert config.timeout == 0.2 assert config.timeout == 0.2
assert config.db == 3 assert config.db == 3
assert config.sentinel_id == 'some_master_id' assert config.sentinel_id == 'some_master_id'
def test_it_sets_absent_values_to_none_or_defaults(self):
server_config_storage = InMemoryConfigStorage({
'redis_metrics_config': {
'redis_host': 'myhost.com',
'redis_port': 6379,
}
})
config = RedisMetricsConnectionConfigBuilder(server_config_storage).get()
assert config.host == 'myhost.com'
assert config.port == 6379
assert config.timeout == 1.5
assert config.db == 5
assert config.sentinel_id is None