Changeset f005e44

Timestamp:

Dec 4, 2008 10:23:03 PM (16 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master, version-1.30, version-2.00, version-3.01, version-3.02

Children:

02786fc

Parents:

c3d5d53

Message:

More cleanup

File:

• fedd/federation/experiment_control.py (modified) (1 diff)

fedd/federation/experiment_control.py

@@ -149 +149 @@
         self.thread_pool = experiment_control_local.thread_pool
 
-        self.cert_file = None
-        self.cert_pwd = None
-        self.trusted_certs = None
-
-        # Walk through the various relevant certificat specifying config
-        # attributes until the local certificate attributes can be resolved.
-        # The walk is from most specific to most general specification.
-        for s in ("experiment_control", "globals"):
-            if config.has_section(s): 
-                if config.has_option(s, "cert_file"):
-                    if not self.cert_file:
-                        self.cert_file = config.get(s, "cert_file")
-                        self.cert_pwd = config.get(s, "cert_pwd")
-
-                if config.has_option(s, "trusted_certs"):
-                    if not self.trusted_certs:
-                        self.trusted_certs = config.get(s, "trusted_certs")
-
+        self.cert_file = config.get("experiment_control", "cert_file")
+        if self.cert_file:
+            self.cert_pwd = config.get("experiment_control", "cert_pwd")
+        else:
+            self.cert_file = config.get("experiment_control", "cert_file")
+            self.cert_pwd = config.get("experiment_control", "cert_pwd")
+
+        self.trusted_certs = config.get("experiment_control", "trusted_certs") \
+                or config.get("globals", "trusted_certs")
 
         self.exp_stem = "fed-stem"