Changeset 769b89a for fedd

Timestamp:

Dec 2, 2008 10:30:40 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:

46a0f7a

Parents:

e087a7a

Message:

Allow no state file - e.g. for allocation only server

File:

• fedd/federation/access.py (modified) (3 diffs)

fedd/federation/access.py

@@ -103 +103 @@
             self.read_access(config.get("access", "accessdb"))
 
-        self.state_filename = config.get("access", "access_state", "")
+        self.state_filename = config.get("access", "access_state")
         self.read_state()
         # Certs are promoted from the generic to the specific, so without a
@@ -304 +304 @@
 
     def write_state(self):
-        try:
-            f = open(self.state_filename, 'w')
-            pickle.dump(self.state, f)
-        except IOError, e:
-            self.log.error("Can't write file %s: %s" % \
-                    (self.state_filename, e))
-        except pickle.PicklingError, e:
-            self.log.error("Pickling problem: %s" % e)
-        except TypeError, e:
-            self.log.error("Pickling problem (TypeError): %s" % e)
+        if self.state_filename:
+            try:
+                f = open(self.state_filename, 'w')
+                pickle.dump(self.state, f)
+            except IOError, e:
+                self.log.error("Can't write file %s: %s" % \
+                        (self.state_filename, e))
+            except pickle.PicklingError, e:
+                self.log.error("Pickling problem: %s" % e)
+            except TypeError, e:
+                self.log.error("Pickling problem (TypeError): %s" % e)
 
 
@@ -322 +323 @@
         State format is a simple pickling of the state dictionary.
         """
-        try:
-            f = open(self.state_filename, "r")
-            self.state = pickle.load(f)
-
-            self.allocation = self.state['allocation']
-            self.projects = self.state['projects']
-            self.keys = self.state['keys']
-
-            self.log.debug("[read_state]: Read state from %s" % \
-                    self.state_filename)
-        except IOError, e:
-            self.log.warning("[read_state]: No saved state: Can't open %s: %s"\
-                    % (self.state_filename, e))
-        except EOFError, e:
-            self.log.warning("[read_state]: Empty or damaged state file: %s:"\
-                    % self.state_filename)
-        except pickle.UnpicklingError, e:
-            self.log.warning(("[read_state]: No saved state: " + \
-                    "Unpickling failed: %s") % e)
-
-        # Add the ownership attributes to the authorizer.  Note that the
-        # indices of the allocation dict are strings, but the attributes are
-        # fedids, so there is a conversion.
-        for k in self.allocation.keys():
-            for o in self.allocation[k].get('owners', []):
-                self.auth.set_attribute(o, fedid(hexstr=k))
+        if self.state_filename:
+            try:
+                f = open(self.state_filename, "r")
+                self.state = pickle.load(f)
+
+                self.allocation = self.state['allocation']
+                self.projects = self.state['projects']
+                self.keys = self.state['keys']
+
+                self.log.debug("[read_state]: Read state from %s" % \
+                        self.state_filename)
+            except IOError, e:
+                self.log.warning(("[read_state]: No saved state: " +\
+                        "Can't open %s: %s") % (self.state_filename, e))
+            except EOFError, e:
+                self.log.warning(("[read_state]: " +\
+                        "Empty or damaged state file: %s:") % \
+                        self.state_filename)
+            except pickle.UnpicklingError, e:
+                self.log.warning(("[read_state]: No saved state: " + \
+                        "Unpickling failed: %s") % e)
+
+            # Add the ownership attributes to the authorizer.  Note that the
+            # indices of the allocation dict are strings, but the attributes are
+            # fedids, so there is a conversion.
+            for k in self.allocation.keys():
+                for o in self.allocation[k].get('owners', []):
+                    self.auth.set_attribute(o, fedid(hexstr=k))