From 54022f6a560ac99cb2540b36aa4a547158418ed6 Mon Sep 17 00:00:00 2001 From: ljaqueme Date: Tue, 11 Jun 2019 14:46:46 -0600 Subject: [PATCH] superseed config with ENV if available --- bin/pdns-import.py | 8 +++++--- bin/pdns-ingestion.py | 7 +++++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/bin/pdns-import.py b/bin/pdns-import.py index 4f89f33..33647c5 100644 --- a/bin/pdns-import.py +++ b/bin/pdns-import.py @@ -51,10 +51,12 @@ logger.info("Starting and using FIFO {} from D4 server".format(myqueue)) analyzer_redis_host = os.getenv('D4_ANALYZER_REDIS_HOST', '127.0.0.1') analyzer_redis_port = int(os.getenv('D4_ANALYZER_REDIS_PORT', 6400)) -d4_server = config.get('global', 'd4-server') -r = redis.Redis(host=analyzer_redis_host, port=analyzer_redis_port) -r_d4 = redis.Redis(host=d4_server.split(':')[0], port=d4_server.split(':')[1], db=2) +d4_server, d4_port = config.get('global', 'd4-server').split(':') +host_redis_metadata = os.getenv('D4_REDIS_METADATA_HOST', d4_server) +port_redis_metadata = int(os.getenv('D4_REDIS_METADATA_PORT', d4_port)) +r = redis.Redis(host=analyzer_redis_host, port=analyzer_redis_port) +r_d4 = redis.Redis(host=host_redis_metadata, port=port_redis_metadata, db=2) with open('../etc/records-type.json') as rtypefile: rtype = json.load(rtypefile) diff --git a/bin/pdns-ingestion.py b/bin/pdns-ingestion.py index 4b36a62..aafb56a 100644 --- a/bin/pdns-ingestion.py +++ b/bin/pdns-ingestion.py @@ -49,9 +49,12 @@ logger.info("Starting and using FIFO {} from D4 server".format(myqueue)) analyzer_redis_host = os.getenv('D4_ANALYZER_REDIS_HOST', '127.0.0.1') analyzer_redis_port = int(os.getenv('D4_ANALYZER_REDIS_PORT', 6400)) -d4_server = config.get('global', 'd4-server') +d4_server, d4_port = config.get('global', 'd4-server').split(':') +host_redis_metadata = os.getenv('D4_REDIS_METADATA_HOST', d4_server) +port_redis_metadata = int(os.getenv('D4_REDIS_METADATA_PORT', d4_port)) + r = redis.Redis(host=analyzer_redis_host, port=analyzer_redis_port) -r_d4 = redis.Redis(host=d4_server.split(':')[0], port=d4_server.split(':')[1], db=2) +r_d4 = redis.Redis(host=host_redis_metadata, port=port_redis_metadata, db=2) with open('../etc/records-type.json') as rtypefile: