Skip to content
Snippets Groups Projects
Commit de316e64 authored by Erik Reid's avatar Erik Reid
Browse files

renamed celery db index config param

parent 31a0e241
Branches
Tags
No related merge requests found
......@@ -37,7 +37,7 @@ CONFIG_SCHEMA = {
"properties": {
"hostname": {"type": "string"},
"port": {"type": "integer"},
"index": {"type": "integer"},
"celery-db-index": {"type": "integer"},
"socket_timeout": {"$ref": "#/definitions/timeout"}
},
"required": ["hostname", "port"],
......@@ -48,7 +48,7 @@ CONFIG_SCHEMA = {
"properties": {
"hostname": {"type": "string"},
"port": {"type": "integer"},
"index": {"type": "integer"},
"celery-db-index": {"type": "integer"},
"name": {"type": "string"},
"redis_socket_timeout": {"$ref": "#/definitions/timeout"},
"sentinel_socket_timeout": {"$ref": "#/definitions/timeout"}
......
import logging
import os
from inventory_provider import config
import redis.sentinel
logger = logging.getLogger(__name__)
DEFAULT_CELERY_DB_INDEX = 1
assert os.path.isfile(os.environ['INVENTORY_PROVIDER_CONFIG_FILENAME']), (
'config file %r not found' %
......@@ -35,7 +35,7 @@ if 'redis_socket_timeout' in params:
_broker_hostname = params['hostname']
_broker_port = params['port']
_broker_db_index = params.get('index', 1)
_broker_db_index = params.get('celery-db-index', DEFAULT_CELERY_DB_INDEX)
if ':' in _broker_hostname:
# assume this means hostname is an ipv6 address
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment