From 640934c41d56c6a23475aa784d1d7e9bc718d280 Mon Sep 17 00:00:00 2001 From: Ananth Suryanarayana Date: Mon, 10 Aug 2015 10:29:52 -0700 Subject: [PATCH] Access configuration sections from config file only if those sections are present Closes-Bug: 1483355 Change-Id: I646bb2b2543a7708e3c95ff91a53ae9573c0b2c3 --- src/discovery/disc_server.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/discovery/disc_server.py b/src/discovery/disc_server.py index 0c32c0c1175..882777c3237 100644 --- a/src/discovery/disc_server.py +++ b/src/discovery/disc_server.py @@ -998,7 +998,6 @@ def parse_args(args_str): if args.conf_file: config = ConfigParser.SafeConfigParser() config.read(args.conf_file) - defaults.update(dict(config.items("DEFAULTS"))) defaults.update(cassandra_opts) for section in config.sections(): if section == "CASSANDRA": @@ -1007,6 +1006,7 @@ def parse_args(args_str): dict(config.items(section))) continue if section == "DEFAULTS": + defaults.update(dict(config.items("DEFAULTS"))) continue service_config[ section.lower()] = default_service_opts.copy()