Merge "Access configuration sections from config file only if those s…

…ections are present"
Juniper · Aug 26, 2015 · 65ae5c9 · 65ae5c9
2 parents 9bf1b58 + 640934c
commit 65ae5c9
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/discovery/disc_server.py b/src/discovery/disc_server.py
@@ -1065,7 +1065,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":
@@ -1074,6 +1073,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()